Entry icons now correctly show up

Auto create new recycle bin works correctly
This commit is contained in:
Geoffroy BONNEVILLE
2020-04-08 20:02:13 +02:00
parent 752e96884d
commit 14fd4634db
5 changed files with 13 additions and 8 deletions

View File

@@ -47,7 +47,7 @@ namespace ModernKeePass.Infrastructure.KeePass
{
get
{
if (_pwDatabase.RecycleBinEnabled)
if (_pwDatabase.RecycleBinEnabled && !_pwDatabase.RecycleBinUuid.Equals(PwUuid.Zero))
{
return _pwDatabase.RecycleBinUuid.ToHexString();
}
@@ -56,7 +56,7 @@ namespace ModernKeePass.Infrastructure.KeePass
}
set
{
_pwDatabase.RecycleBinUuid = BuildIdFromString(value);
_pwDatabase.RecycleBinUuid = value != null ? BuildIdFromString(value) : PwUuid.Zero;
_pwDatabase.RecycleBinChanged = _dateTime.Now;
}
}
@@ -331,7 +331,7 @@ namespace ModernKeePass.Infrastructure.KeePass
if (disposing)
{
_pwDatabase.Close();
_pwDatabase?.Close();
}
_disposed = true;