mirror of
https://github.com/moparisthebest/keepass2android
synced 2024-11-25 18:52:19 -05:00
Fixed reference equality checks for PwUuid
This commit is contained in:
parent
f06ce9c58b
commit
bf84662857
@ -58,8 +58,8 @@ namespace KeePassLib
|
||||
{
|
||||
Debug.Assert(pwUuid != null);
|
||||
if(pwUuid == null) throw new ArgumentNullException("pwUuid");
|
||||
Debug.Assert(pwUuid != PwUuid.Zero);
|
||||
if(pwUuid == PwUuid.Zero) throw new ArgumentException("pwUuid == 0");
|
||||
Debug.Assert(!pwUuid.EqualsValue(PwUuid.Zero));
|
||||
if(pwUuid.EqualsValue(PwUuid.Zero)) throw new ArgumentException("pwUuid == 0");
|
||||
|
||||
Debug.Assert(pbImageDataPng != null);
|
||||
if(pbImageDataPng == null) throw new ArgumentNullException("pbImageDataPng");
|
||||
|
@ -377,7 +377,7 @@ namespace KeePassLib.Serialization
|
||||
WriteObject(ElemNotes, pg.Notes, true);
|
||||
WriteObject(ElemIcon, (int)pg.IconId);
|
||||
|
||||
if(pg.CustomIconUuid != PwUuid.Zero)
|
||||
if(!pg.CustomIconUuid.EqualsValue(PwUuid.Zero))
|
||||
WriteObject(ElemCustomIconID, pg.CustomIconUuid);
|
||||
|
||||
WriteList(ElemTimes, pg);
|
||||
@ -402,7 +402,7 @@ namespace KeePassLib.Serialization
|
||||
WriteObject(ElemUuid, pe.Uuid);
|
||||
WriteObject(ElemIcon, (int)pe.IconId);
|
||||
|
||||
if(pe.CustomIconUuid != PwUuid.Zero)
|
||||
if(!pe.CustomIconUuid.EqualsValue(PwUuid.Zero))
|
||||
WriteObject(ElemCustomIconID, pe.CustomIconUuid);
|
||||
|
||||
WriteObject(ElemFgColor, StrUtil.ColorToUnnamedHtml(pe.ForegroundColor, true), false);
|
||||
|
Loading…
Reference in New Issue
Block a user