Merge branch 'master' into develop

2020-04-09 18:27:40 +02:00
parent 6128e5d582 dcca5aa0f0
commit d189f9132e
21 changed files with 943 additions and 933 deletions
--- a/src/gui/DatabaseWidget.cpp
+++ b/src/gui/DatabaseWidget.cpp
@@ -1732,6 +1732,7 @@ bool DatabaseWidget::save()

    auto focusWidget = qApp->focusWidget();

+    // TODO: Make this async
    // Lock out interactions
    m_entryView->setDisabled(true);
    m_groupView->setDisabled(true);