Merge branch 'master' into develop

This commit is contained in:
Jonathan White 2019-05-31 16:17:47 -04:00
commit 16a11c3a7f
No known key found for this signature in database
GPG key ID: 440FC65F2E0C6E01
24 changed files with 1044 additions and 926 deletions

View file

@ -783,6 +783,9 @@ void DatabaseWidget::switchToMainView(bool previousDialogAccepted)
}
m_newParent = nullptr;
} else {
// Workaround: ensure entries are focused so search doesn't reset
m_entryView->setFocus();
}
setCurrentWidget(m_mainWidget);