From ecfbad0443d638585c38554fa0e8baeac6d14fac Mon Sep 17 00:00:00 2001 From: Louis-Bertrand Varin Date: Tue, 24 Oct 2017 20:26:02 -0400 Subject: [PATCH 1/2] Disable reload prompt when db is locked --- src/gui/DatabaseWidget.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp index 7fbcbe35c..0cf418286 100644 --- a/src/gui/DatabaseWidget.cpp +++ b/src/gui/DatabaseWidget.cpp @@ -825,7 +825,7 @@ void DatabaseWidget::unlockDatabase(bool accepted) return; } - Database *db = Q_NULLPTR; + Database* db = Q_NULLPTR; if (sender() == m_unlockDatabaseDialog) { db = m_unlockDatabaseDialog->database(); } else if (sender() == m_unlockDatabaseWidget) { @@ -1125,8 +1125,13 @@ void DatabaseWidget::onWatchedFileChanged() void DatabaseWidget::reloadDatabaseFile() { - if (m_db == nullptr) + if (m_db == nullptr) { return; + } + + if (currentMode() == DatabaseWidget::LockedMode) { + return; + } if (! config()->get("AutoReloadOnChange").toBool()) { // Ask if we want to reload the db From 055ba4f14ed4cf69519f5d5c6313fd231718bf1d Mon Sep 17 00:00:00 2001 From: Louis-Bertrand Varin Date: Wed, 25 Oct 2017 10:15:37 -0400 Subject: [PATCH 2/2] Q_NULLPTR -> nullptr --- src/gui/DatabaseWidget.cpp | 2 +- src/gui/UnlockDatabaseDialog.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp index 0cf418286..6a425b5d7 100644 --- a/src/gui/DatabaseWidget.cpp +++ b/src/gui/DatabaseWidget.cpp @@ -825,7 +825,7 @@ void DatabaseWidget::unlockDatabase(bool accepted) return; } - Database* db = Q_NULLPTR; + Database* db = nullptr; if (sender() == m_unlockDatabaseDialog) { db = m_unlockDatabaseDialog->database(); } else if (sender() == m_unlockDatabaseWidget) { diff --git a/src/gui/UnlockDatabaseDialog.h b/src/gui/UnlockDatabaseDialog.h index 9a42ed6e2..ef2eabb30 100644 --- a/src/gui/UnlockDatabaseDialog.h +++ b/src/gui/UnlockDatabaseDialog.h @@ -31,7 +31,7 @@ class UnlockDatabaseDialog : public QDialog { Q_OBJECT public: - explicit UnlockDatabaseDialog(QWidget* parent = Q_NULLPTR); + explicit UnlockDatabaseDialog(QWidget* parent = nullptr); void setDBFilename(const QString& filename); void clearForms(); Database* database();