Clear database open dialog before and after merging a database (#958)

2017-09-23 11:43:29 -04:00
parent daef0a358c
commit df3051038e
5 changed files with 15 additions and 12 deletions
--- a/src/gui/DatabaseWidget.cpp
+++ b/src/gui/DatabaseWidget.cpp
@@ -813,6 +813,7 @@ void DatabaseWidget::mergeDatabase(bool accepted)
        m_db->merge(srcDb);
    }

+    m_databaseOpenMergeWidget->clearForms();
    setCurrentWidget(m_mainWidget);
    emit databaseMerged(m_db);
 }
@@ -918,6 +919,7 @@ void DatabaseWidget::switchToImportCsv(const QString& fileName)

 void DatabaseWidget::switchToOpenMergeDatabase(const QString& fileName)
 {
+    m_databaseOpenMergeWidget->clearForms();
    m_databaseOpenMergeWidget->load(fileName);
    setCurrentWidget(m_databaseOpenMergeWidget);
 }