mirror of
https://github.com/wismna/ModernKeePass.git
synced 2025-10-03 15:40:18 -04:00
Entry icons now correctly show up
Auto create new recycle bin works correctly
This commit is contained in:
@@ -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;
|
||||
|
Reference in New Issue
Block a user