Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-12-28 16:59:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* Add gui dialog when merge makes no changes
* Add gui dialog when merge makes changes
This commit is contained in:
AlexJoss 2019-01-21 11:28:37 -08:00 committed by Jonathan White
parent 0da9efdbd4
commit cbf92598e2
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/DatabaseWidget.cpp
View File

@ -863,7 +863,13 @@ void DatabaseWidget::mergeDatabase(bool accepted)
} }
Merger merger(srcDb.data(), m_db.data()); 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(); switchToMainView();