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
This commit is contained in:
		
							parent
							
								
									3839c091a3
								
							
						
					
					
						commit
						f91a09dabb
					
				| 
						 | 
					@ -60,7 +60,7 @@ void KpxUuid::toRaw(void* dst)const{
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void KpxUuid::fromRaw(const void* src){
 | 
					void KpxUuid::fromRaw(const void* src){
 | 
				
			||||||
	Data.replace(0,16,(char*)src);
 | 
						Data=QByteArray((char*)src,16);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
bool KpxUuid::operator==(const KpxUuid& other)const{
 | 
					bool KpxUuid::operator==(const KpxUuid& other)const{
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -220,7 +220,6 @@ void CEditEntryDlg::OnButtonOK()
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	// MX-COMMENT: Should not this line go inside the if(Modflag) block?
 | 
						// MX-COMMENT: Should not this line go inside the if(Modflag) block?
 | 
				
			||||||
	entry->setImage(IconIndex);
 | 
						entry->setImage(IconIndex);
 | 
				
			||||||
	entry->setOldImage(IconIndex);
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if(ModFlag&&EntryMoved)done(2);
 | 
						if(ModFlag&&EntryMoved)done(2);
 | 
				
			||||||
	else if(ModFlag)done(1);
 | 
						else if(ModFlag)done(1);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue