From a2be015a43b9d0de710539ee3838bb3aafe6bb2c Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Sun, 3 Mar 2019 17:10:09 +0100 Subject: 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 --- desktop-widgets/tab-widgets/maintab.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'desktop-widgets/tab-widgets') 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(); -- cgit v1.2.3-70-g09d2