Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-10-01 01:26:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash when deleting parent group of recycle bin.

Browse Source 
In these cases delete the group instead of trying to move it to the recycle bin.

Closes #520
This commit is contained in:
Felix Geyer 2016-08-03 23:24:08 +02:00
parent 9532bedd7d
commit bf2fd63131
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/DatabaseWidget.cpp
View File

@ -493,7 +493,9 @@ void DatabaseWidget::deleteGroup()
} }
bool inRecylceBin = Tools::hasChild(m_db->metadata()->recycleBin(), currentGroup); bool inRecylceBin = Tools::hasChild(m_db->metadata()->recycleBin(), currentGroup);
if (inRecylceBin || !m_db->metadata()->recycleBinEnabled()) { bool isRecycleBin = (currentGroup == m_db->metadata()->recycleBin());
bool isRecycleBinSubgroup = Tools::hasChild(currentGroup, m_db->metadata()->recycleBin());
if (inRecylceBin || isRecycleBin || isRecycleBinSubgroup || !m_db->metadata()->recycleBinEnabled()) {
QMessageBox::StandardButton result = MessageBox::question( QMessageBox::StandardButton result = MessageBox::question(
this, tr("Delete group?"), this, tr("Delete group?"),
tr("Do you really want to delete the group \"%1\" for good?") tr("Do you really want to delete the group \"%1\" for good?")