Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-07-12 01:29:38 -04:00
Code Issues Projects Releases Packages Wiki Activity

Close search before locking database and add additional check on current group.

Browse source 
Closes #309.
This commit is contained in:
Florian Geyer 2015-07-20 22:10:44 +02:00
parent 98d9dae087
commit 41a7c96968
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/gui/DatabaseWidget.cpp
View file

@ -889,8 +889,17 @@ void DatabaseWidget::clearLastGroup(Group* group)
void DatabaseWidget::lock() void DatabaseWidget::lock()
{ {
Q_ASSERT(currentMode() != DatabaseWidget::LockedMode); Q_ASSERT(currentMode() != DatabaseWidget::LockedMode);
if (isInSearchMode()) {
closeSearch();
}
if (m_groupView->currentGroup()) {
m_groupBeforeLock = m_groupView->currentGroup()->uuid(); m_groupBeforeLock = m_groupView->currentGroup()->uuid();
}
else {
m_groupBeforeLock = m_db->rootGroup()->uuid();
}
clearAllWidgets(); clearAllWidgets();
m_unlockDatabaseWidget->load(m_filename); m_unlockDatabaseWidget->load(m_filename);
setCurrentWidget(m_unlockDatabaseWidget); setCurrentWidget(m_unlockDatabaseWidget);