Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-02-17 21:04:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1119 from louib/no_reload_prompt_when_locked

Browse Source 
Disable reload prompt when db is locked
This commit is contained in:
Janek Bevendorff 2017-10-25 16:45:51 +02:00 committed by GitHub
commit 0c3f352c63
2 changed files with 8 additions and 3 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 = 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

2
src/gui/UnlockDatabaseDialog.h
View File

@ -31,7 +31,7 @@ class UnlockDatabaseDialog : public QDialog
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit UnlockDatabaseDialog(QWidget* parent = Q_NULLPTR); explicit UnlockDatabaseDialog(QWidget* parent = nullptr);
void setDBFilename(const QString& filename); void setDBFilename(const QString& filename);
void clearForms(); void clearForms();
Database* database(); Database* database();