Compare commits

..

No commits in common. "6d3db23f804e4c82de0f9b1c6b340f99cbdc21af" and "8002236c1f6e822721193e4972fd977febfaa809" have entirely different histories.

4 changed files with 3 additions and 17 deletions

View File

@ -9,8 +9,7 @@
Icon="avares://DiscordHistoryTracker/Resources/icon.ico" Icon="avares://DiscordHistoryTracker/Resources/icon.ico"
Width="800" Height="500" Width="800" Height="500"
MinWidth="480" MinHeight="240" MinWidth="480" MinHeight="240"
WindowStartupLocation="CenterScreen" WindowStartupLocation="CenterScreen">
Closed="OnClosed">
<Design.DataContext> <Design.DataContext>
<main:MainWindowModel /> <main:MainWindowModel />

View File

@ -1,4 +1,3 @@
using System;
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
using Avalonia; using Avalonia;
using Avalonia.Controls; using Avalonia.Controls;
@ -25,11 +24,5 @@ namespace DHT.Desktop.Main {
this.AttachDevTools(); this.AttachDevTools();
#endif #endif
} }
public void OnClosed(object? sender, EventArgs e) {
if (DataContext is IDisposable disposable) {
disposable.Dispose();
}
}
} }
} }

View File

@ -10,7 +10,7 @@ using DHT.Server.Database;
using DHT.Utils.Models; using DHT.Utils.Models;
namespace DHT.Desktop.Main { namespace DHT.Desktop.Main {
sealed class MainWindowModel : BaseModel, IDisposable { sealed class MainWindowModel : BaseModel {
private const string DefaultTitle = "Discord History Tracker"; private const string DefaultTitle = "Discord History Tracker";
public string Title { get; private set; } = DefaultTitle; public string Title { get; private set; } = DefaultTitle;
@ -104,10 +104,5 @@ namespace DHT.Desktop.Main {
private void MainContentScreenModelOnDatabaseClosed(object? sender, EventArgs e) { private void MainContentScreenModelOnDatabaseClosed(object? sender, EventArgs e) {
WelcomeScreenModel.CloseDatabase(); WelcomeScreenModel.CloseDatabase();
} }
public void Dispose() {
MainContentScreenModel?.Dispose();
db?.Dispose();
}
} }
} }

View File

@ -12,7 +12,7 @@ using Microsoft.Extensions.DependencyInjection;
namespace DHT.Server.Service { namespace DHT.Server.Service {
public static class ServerLauncher { public static class ServerLauncher {
private static readonly Log Log = Log.ForType(typeof(ServerLauncher)); private static readonly Log Log = Log.ForType(typeof(ServerLauncher));
private static IWebHost? Server { get; set; } = null; private static IWebHost? Server { get; set; } = null;
public static bool IsRunning { get; private set; } public static bool IsRunning { get; private set; }
@ -29,7 +29,6 @@ namespace DHT.Server.Service {
try { try {
if (ManagementThread == null) { if (ManagementThread == null) {
ManagementThread = new Thread(RunManagementThread) { ManagementThread = new Thread(RunManagementThread) {
Name = "DHT server management thread",
IsBackground = true IsBackground = true
}; };
ManagementThread.Start(); ManagementThread.Start();