diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-09-22 22:00:29 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-10-02 08:04:49 -0700 |
| commit | 5037fcdbdc867c542661b0b31debd8580777c30e (patch) | |
| tree | f237f108cba1ac3cc0430c75caabeb13febb2b22 /qt-models | |
| parent | 087a80194a54554ab0510a3c2ccc906a448d36ba (diff) | |
| download | subsurface-5037fcdbdc867c542661b0b31debd8580777c30e.tar.gz | |
Import: avoid model inconsistency in DiveImportedModel::recordDives()
DiveImportedModel::recordDives() called add_imported_dives(). But that
actually consumes the dive and dive-site tables. Which in turn will
lead to an inconsistent model.
Properly reset the model by using the consumeTables() function.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'qt-models')
| -rw-r--r-- | qt-models/diveimportedmodel.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/qt-models/diveimportedmodel.cpp b/qt-models/diveimportedmodel.cpp index 7e70ce0a7..10d1d74d2 100644 --- a/qt-models/diveimportedmodel.cpp +++ b/qt-models/diveimportedmodel.cpp @@ -199,14 +199,21 @@ void DiveImportedModel::deleteDeselected() // Note: this function is only used from mobile - perhaps move it there or unify. void DiveImportedModel::recordDives() { + deleteDeselected(); + if (diveTable.nr == 0) // nothing to do, just exit return; - deleteDeselected(); + // Consume the tables. They will be consumed by add_imported_dives() anyway. + // But let's do it in a controlled way with a proper model-reset so that the + // model doesn't become inconsistent. + std::pair<struct dive_table, struct dive_site_table> tables = consumeTables(); // TODO: Might want to let the user select IMPORT_ADD_TO_NEW_TRIP - add_imported_dives(&diveTable, nullptr, &sitesTable, IMPORT_PREFER_IMPORTED | IMPORT_IS_DOWNLOADED); + add_imported_dives(&tables.first, nullptr, &tables.second, IMPORT_PREFER_IMPORTED | IMPORT_IS_DOWNLOADED); + free(tables.first.dives); + free(tables.second.dive_sites); } QHash<int, QByteArray> DiveImportedModel::roleNames() const { |