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

Fix: Crash when moving entry to another group (Bug #2644545)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@277 b624d157-de02-0410-bad0-e51aec6abb33
master
sniperbeamer 16 years ago
parent 13df3a6c72
commit 5944e2620f
2 changed files with 5 additions and 5 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      src/dialogs/EditEntryDlg.cpp
  2. 9
      src/lib/EntryView.cpp

1
src/dialogs/EditEntryDlg.cpp
Unescape View File

@ -220,7 +220,6 @@ void CEditEntryDlg::OnButtonOK()
if(Combo_Group->currentIndex()!=GroupIndex){
db->moveEntry(entry,groups[Combo_Group->currentIndex()]);
EntryMoved=true;
ModFlag=true;
}
if(EntryMoved)

9
src/lib/EntryView.cpp
Unescape View File

@ -216,9 +216,10 @@ void KeepassEntryView::updateEntry(EntryViewItem* item){
}
void KeepassEntryView::editEntry(EntryViewItem* item){
CEntry old = item->EntryHandle->data();
IEntryHandle* handle = item->EntryHandle;
CEntry old = handle->data();
CEditEntryDlg dlg(db,item->EntryHandle,this,true);
CEditEntryDlg dlg(db,handle,this,true);
int result = dlg.exec();
switch(result){
case 0: //canceled or no changes
@ -230,14 +231,14 @@ void KeepassEntryView::editEntry(EntryViewItem* item){
//entry moved to another group
case 2: //modified
case 3: //not modified
Items.removeOne(item);
delete item;
Items.removeAt(Items.indexOf(item));
emit fileModified();
break;
}
IGroupHandle* bGroup;
if ((result==1 || result==2) && config->backup() && item->EntryHandle->group() != (bGroup=db->backupGroup())){
if ((result==1 || result==2) && config->backup() && handle->group() != (bGroup=db->backupGroup())){
old.LastAccess = QDateTime::currentDateTime();
old.LastMod = old.LastAccess;
if (bGroup==NULL)