Add gui dialog when merge makes no changes (#2551)

* Add gui dialog when merge makes no changes * Add gui dialog when merge makes changes
keepassxreboot · Jan 21, 2019 · cbf9259 · cbf9259
1 parent 0da9efd
commit cbf9259
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp
@@ -863,7 +863,13 @@ void DatabaseWidget::mergeDatabase(bool accepted)
         }
 
         Merger merger(srcDb.data(), m_db.data());
-        merger.merge();
+        bool databaseChanged = merger.merge();
+
+        if (databaseChanged) {
+            showMessage(tr("Successfully merged the database files."), MessageWidget::Information);
+        } else {
+            showMessage(tr("Database was not modified by merge operation."), MessageWidget::Information);
+        }
     }
 
     switchToMainView();