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

Disable reload prompt when db is locked

Browse Source
This commit is contained in:
Louis-Bertrand Varin 2017-10-24 20:26:02 -04:00
parent 8f0e717404
commit ecfbad0443
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/DatabaseWidget.cpp
View File

@ -825,7 +825,7 @@ void DatabaseWidget::unlockDatabase(bool accepted)
return; return;
} }
Database *db = Q_NULLPTR; Database* db = Q_NULLPTR;
if (sender() == m_unlockDatabaseDialog) { if (sender() == m_unlockDatabaseDialog) {
db = m_unlockDatabaseDialog->database(); db = m_unlockDatabaseDialog->database();
} else if (sender() == m_unlockDatabaseWidget) { } else if (sender() == m_unlockDatabaseWidget) {
@ -1125,8 +1125,13 @@ void DatabaseWidget::onWatchedFileChanged()
void DatabaseWidget::reloadDatabaseFile() void DatabaseWidget::reloadDatabaseFile()
{ {
if (m_db == nullptr) if (m_db == nullptr) {
return; return;
}
if (currentMode() == DatabaseWidget::LockedMode) {
return;
}
if (! config()->get("AutoReloadOnChange").toBool()) { if (! config()->get("AutoReloadOnChange").toBool()) {
// Ask if we want to reload the db // Ask if we want to reload the db