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

Fix more database disposal issues

Browse Source
This commit is contained in:
chylex 2022-03-06 15:22:03 +01:00
parent e420add646
commit 72c13cbb58
No known key found for this signature in database
GPG Key ID: 4DE42C8F19A80548
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Desktop/Main/MainWindowModel.cs
View File

@ -106,8 +106,10 @@ namespace DHT.Desktop.Main {
} }
public void Dispose() { public void Dispose() {
WelcomeScreenModel.Dispose();
MainContentScreenModel?.Dispose(); MainContentScreenModel?.Dispose();
db?.Dispose(); db?.Dispose();
db = null;
} }
} }
} }

10
app/Desktop/Main/WelcomeScreenModel.cs
View File

@ -8,7 +8,7 @@ using DHT.Server.Database;
using DHT.Utils.Models; using DHT.Utils.Models;
namespace DHT.Desktop.Main { namespace DHT.Desktop.Main {
sealed class WelcomeScreenModel : BaseModel { sealed class WelcomeScreenModel : BaseModel, IDisposable {
public string Version => Program.Version; public string Version => Program.Version;
public IDatabaseFile? Db { get; private set; } public IDatabaseFile? Db { get; private set; }
@ -52,8 +52,7 @@ namespace DHT.Desktop.Main {
} }
public void CloseDatabase() { public void CloseDatabase() {
Db = null; Dispose();
OnPropertyChanged(nameof(Db)); OnPropertyChanged(nameof(Db));
OnPropertyChanged(nameof(HasDatabase)); OnPropertyChanged(nameof(HasDatabase));
} }
@ -65,5 +64,10 @@ namespace DHT.Desktop.Main {
public void Exit() { public void Exit() {
window.Close(); window.Close();
} }
public void Dispose() {
Db?.Dispose();
Db = null;
}
} }
} }