Fix more database disposal issues

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

View File

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

View File

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