Merge branch 'release/2.2.3' into develop

2017-11-26 18:23:48 +01:00
parent a519ec6220 b20918b60e
commit 8651736e61
9 changed files with 94 additions and 53 deletions
--- a/src/gui/DatabaseWidget.cpp
+++ b/src/gui/DatabaseWidget.cpp
@@ -1206,7 +1206,7 @@ void DatabaseWidget::onWatchedFileChanged()

 void DatabaseWidget::reloadDatabaseFile()
 {
-    if (m_db == nullptr) {
+    if (!m_db || currentMode() == DatabaseWidget::LockedMode) {
        return;
    }