Merge branch 'release/2.2.3' into develop

This commit is contained in:
Janek Bevendorff 2017-11-26 18:23:48 +01:00
commit 8651736e61
No known key found for this signature in database
GPG key ID: 2FDEB0D40BCA5E11
9 changed files with 94 additions and 53 deletions

View file

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