thooge
/
keepassx1
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed: custom icons get lost on restart (Closes #1995561) 

git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@208 b624d157-de02-0410-bad0-e51aec6abb33
This commit is contained in:
sniperbeamer 2008-06-24 17:56:02 +00:00
parent 90d515f6e7
commit dc43c39ece
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Kdb3Database.cpp
View File

@ -93,11 +93,13 @@ bool Kdb3Database::parseMetaStream(const StdEntry& entry){
if(entry.Comment=="KPX_GROUP_TREE_STATE"){
parseGroupTreeStateMetaStream(entry.Binary);
return true;}
return true;
}
if(entry.Comment=="KPX_CUSTOM_ICONS_3"){
parseCustomIconsMetaStream(entry.Binary);
return true;}
return true;
}
if(entry.Comment=="KPX_CUSTOM_ICONS_2")
return parseCustomIconsMetaStreamV2(entry.Binary);
@ -1156,10 +1158,12 @@ bool Kdb3Database::save(){
-----------------------------------------------------------------------------------*/
for(int i=0;i<Groups.size();i++){
if(Groups[i].Image<builtinIcons())
Groups[i].OldImage=Groups[i].Image;}
Groups[i].OldImage=Groups[i].Image;
}
for(int i=0;i<Entries.size();i++){
if(Entries[i].Image<builtinIcons())
Entries[i].OldImage=Entries[i].Image;}
Entries[i].OldImage=Entries[i].Image;
}
/* ----------------------------------------------------------------------------------*/
unsigned int FileSize;

1
src/dialogs/EditEntryDlg.cpp
View File

@ -220,6 +220,7 @@ void CEditEntryDlg::OnButtonOK()
}
// MX-COMMENT: Should not this line go inside the if(Modflag) block?
entry->setImage(IconIndex);
entry->setOldImage(IconIndex);
if(ModFlag&&EntryMoved)done(2);
else if(ModFlag)done(1);