From 0dfc59f38cf3d75d9c86af51d17bb578b8655f7b Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Sun, 23 Dec 2018 16:30:19 +0100 Subject: Import: add merge_all_trips parameter to process_imported_dives() When importing log-files we generally want to merge trips. But when downloading and the user chose "generate new trip", that new trip should not be merged into existing trips. Therefore, add a "merge_all_trips" parameter to process_imported_dives(). If false only autogenerated trips [via autogroup] will be merged. In the future we might want to let the user choose if trips should be merged when importing log-files. Signed-off-by: Berthold Stoeger --- mobile-widgets/qmlmanager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mobile-widgets') diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp index aadb413cc..337a5f49f 100644 --- a/mobile-widgets/qmlmanager.cpp +++ b/mobile-widgets/qmlmanager.cpp @@ -341,7 +341,7 @@ void QMLManager::mergeLocalRepo() struct dive_table table = { 0 }; struct trip_table trips = { 0 }; parse_file(filename, &table, &trips); - process_imported_dives(&table, &trips, false, false); + process_imported_dives(&table, &trips, false, false, true); } void QMLManager::copyAppLogToClipboard() -- cgit v1.2.3-70-g09d2