From f91a09dabb00b3353fb316e84b4a1d3d4837fd3c Mon Sep 17 00:00:00 2001
From: sniperbeamer <sniperbeamer@b624d157-de02-0410-bad0-e51aec6abb33>
Date: Mon, 30 Jun 2008 15:42:36 +0000
Subject: [PATCH] Better fix: custom icons get lost on restart

git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@210 b624d157-de02-0410-bad0-e51aec6abb33
---
 src/Database.cpp             | 2 +-
 src/dialogs/EditEntryDlg.cpp | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Database.cpp b/src/Database.cpp
index 5c306c8..c87fd32 100644
--- a/src/Database.cpp
+++ b/src/Database.cpp
@@ -60,7 +60,7 @@ void KpxUuid::toRaw(void* dst)const{
 }
 
 void KpxUuid::fromRaw(const void* src){
-	Data.replace(0,16,(char*)src);
+	Data=QByteArray((char*)src,16);
 }
 
 bool KpxUuid::operator==(const KpxUuid& other)const{
diff --git a/src/dialogs/EditEntryDlg.cpp b/src/dialogs/EditEntryDlg.cpp
index 3b6be83..5c519c4 100644
--- a/src/dialogs/EditEntryDlg.cpp
+++ b/src/dialogs/EditEntryDlg.cpp
@@ -220,7 +220,6 @@ 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);