Undo: consider dive site in AddDive()

If a dive site was added for a new dive, remove it on undo.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>

1 files changed, 11 insertions, 3 deletions

diff --git a/desktop-widgets/tab-widgets/maintab.cpp b/desktop-widgets/tab-widgets/maintab.cpp
index edabd41fe..18d424437 100644
--- a/desktop-widgets/tab-widgets/maintab.cpp
+++ b/desktop-widgets/tab-widgets/maintab.cpp
@@ -712,11 +712,19 @@ void MainTab::acceptChanges()
 	hideMessage();
 	ui.equipmentTab->setEnabled(true);
 	if (editMode == ADD) {
-		// make sure that the dive site is handled as well
-		updateDiveSite(ui.location->currDiveSite(), &displayed_dive);
+		// Handle dive site
+		struct dive_site *pickedDs = ui.location->currDiveSite();
+		QString newDiveSiteName;
+		if (pickedDs == RECENTLY_ADDED_DIVESITE) {
+			newDiveSiteName = ui.location->text();
+			displayed_dive.dive_site = nullptr;
+		} else {
+			displayed_dive.dive_site = pickedDs;
+		}
+
 		copyTagsToDisplayedDive();
 
-		Command::addDive(&displayed_dive, autogroup, true);
+		Command::addDive(&displayed_dive, newDiveSiteName, autogroup, true);
 
 		editMode = NONE;
 		MainWindow::instance()->exitEditState();