From f022a4a4d0d3c0c022b6ce2b7b11c0ff9bf8089d Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Wed, 13 Mar 2019 00:18:40 +0100 Subject: Dive site: don't auto delete unused dive sites This feature will be replaced by. 1) An explicit purge empty dive sites feature. 2) Not allocating dummy dive sites for GPS coordinates. Signed-off-by: Berthold Stoeger --- desktop-widgets/tab-widgets/maintab.cpp | 7 ------- 1 file changed, 7 deletions(-) (limited to 'desktop-widgets/tab-widgets/maintab.cpp') diff --git a/desktop-widgets/tab-widgets/maintab.cpp b/desktop-widgets/tab-widgets/maintab.cpp index a8dd87cb4..f481428d7 100644 --- a/desktop-widgets/tab-widgets/maintab.cpp +++ b/desktop-widgets/tab-widgets/maintab.cpp @@ -855,18 +855,11 @@ void MainTab::acceptChanges() } // update the dive site for the selected dives that had the same dive site as the current dive - struct dive_site *oldDs = cd->dive_site; struct dive_site *newDs = nullptr; MODIFY_DIVES(selectedDives, if (mydive->dive_site == current_dive->dive_site) newDs = updateDiveSite(!newDs ? ui.location->currDiveSite() : newDs, mydive); ); - if (oldDs && !is_dive_site_used(oldDs, false)) { - if (verbose) - qDebug() << "delete now unused dive site" << (oldDs->name ? oldDs->name : "without name"); - delete_dive_site(oldDs, &dive_site_table); - MapWidget::instance()->reload(); - } // the code above can change the correct uuid for the displayed dive site - and the // code below triggers an update of the display without re-initializing displayed_dive // so let's make sure here that our data is consistent now that we have handled the -- cgit v1.2.3-70-g09d2