diff options
Diffstat (limited to 'mobile-widgets')
| -rw-r--r-- | mobile-widgets/qml/DownloadFromDiveComputer.qml | 2 | ||||
| -rw-r--r-- | mobile-widgets/qmlmanager.cpp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/mobile-widgets/qml/DownloadFromDiveComputer.qml b/mobile-widgets/qml/DownloadFromDiveComputer.qml index a1403b07d..2377db951 100644 --- a/mobile-widgets/qml/DownloadFromDiveComputer.qml +++ b/mobile-widgets/qml/DownloadFromDiveComputer.qml @@ -28,7 +28,7 @@ Kirigami.Page { id: downloadThread onFinished : { - importModel.repopulate(table) + importModel.repopulate(table, sites) progressBar.visible = false if (dcImportModel.rowCount() > 0) { console.log(dcImportModel.rowCount() + " dive downloaded") diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp index 9603a2ad0..4db9cbb63 100644 --- a/mobile-widgets/qmlmanager.cpp +++ b/mobile-widgets/qmlmanager.cpp @@ -341,8 +341,9 @@ void QMLManager::mergeLocalRepo() char *filename = NOCLOUD_LOCALSTORAGE; struct dive_table table = { 0 }; struct trip_table trips = { 0 }; - parse_file(filename, &table, &trips, &dive_site_table); - add_imported_dives(&table, &trips, IMPORT_MERGE_ALL_TRIPS); + struct dive_site_table sites = { 0 }; + parse_file(filename, &table, &trips, &sites); + add_imported_dives(&table, &trips, &sites, IMPORT_MERGE_ALL_TRIPS); } void QMLManager::copyAppLogToClipboard() |