diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-12-23 22:08:00 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-01-09 20:58:04 -0800 |
| commit | 0249e125898134d3f6d4a2a8972f3eeb30c02803 (patch) | |
| tree | 4830c88c2d61a096a2f1afdcc71bddf8d330cf73 /mobile-widgets | |
| parent | fd196f143ae9c6b3a51b057ba134c5e3a280e30f (diff) | |
| download | subsurface-0249e125898134d3f6d4a2a8972f3eeb30c02803.tar.gz | |
Import: split process_imported_dives() function
Split the process_imported_dives() function in two:
1) process_imported_dives() processes the dives and generates
a list of dives and trips to be added and removed.
2) add_imported_dives() calls process_imported_dives() and
does the actual removal / addition of dives and trips.
The goal is to split preparation and actual work, to
make dive import undo-able.
The code adds extra checks to never merge into the same
dive twice, as this would lead to a double-free() bug.
This should in principle never happen, as dives that
compare equal according to is_same_dive() are merged
in the imported-dives list, but perhaps in some pathologival
corner-cases is_same_dive() turns out to be non-transitive.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'mobile-widgets')
| -rw-r--r-- | mobile-widgets/qmlmanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp index 337a5f49f..3a38fb90d 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, true); + add_imported_dives(&table, &trips, false, false, true); } void QMLManager::copyAppLogToClipboard() |