third-party-mirrors/Discord-History-Tracker
1
0
Fork 0
mirror of https://github.com/chylex/Discord-History-Tracker.git synced 2025-06-13 22:02:18 +03:00
Code Issues Projects Releases Wiki Activity

Fix not manually disposing of resources when the app window is closed

Browse Source
This commit is contained in:
chylex 2022-03-05 13:35:11 +01:00
parent 4bc9626013
commit 6d3db23f80
No known key found for this signature in database
GPG Key ID: 4DE42C8F19A80548
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Desktop/Main/MainWindow.axaml
View File

@ -9,7 +9,8 @@
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 />

7
app/Desktop/Main/MainWindow.axaml.cs
View File

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

7
app/Desktop/Main/MainWindowModel.cs
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 { sealed class MainWindowModel : BaseModel, IDisposable {
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,5 +104,10 @@ 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();
}
} }
} }