From cbf92598e214da5594e9c5c2d17b72820b89840b Mon Sep 17 00:00:00 2001
From: AlexJoss <44148378+AlexJoss@users.noreply.github.com>
Date: Mon, 21 Jan 2019 11:28:37 -0800
Subject: [PATCH] Add gui dialog when merge makes no changes (#2551)

* Add gui dialog when merge makes no changes
* Add gui dialog when merge makes changes
---
 src/gui/DatabaseWidget.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp
index d1afbfa2..e7599c91 100644
--- 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();