From 8ff78263029e233ff3efb3895f91b85c745bb4a2 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Thu, 4 Jun 2015 00:30:26 -0300 Subject: Fix reject changes for add/edit Reject changes was correct only for Edit, but not for Add. When in add mode we need to retrieve the old dive site, and when in edit mode we should do nothing. Signed-off-by: Tomaz Canabrava Signed-off-by: Dirk Hohndel --- qt-ui/locationinformation.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'qt-ui') diff --git a/qt-ui/locationinformation.cpp b/qt-ui/locationinformation.cpp index 17eccf5f2..9f1262bb3 100644 --- a/qt-ui/locationinformation.cpp +++ b/qt-ui/locationinformation.cpp @@ -113,10 +113,15 @@ void LocationInformationWidget::createDiveSite() void LocationInformationWidget::rejectChanges() { - if (currentDs && dive_site_is_empty(currentDs)) { + if (current_mode == CREATE_DIVE_SITE) { + LocationInformationModel::instance()->removeRow(get_divesite_idx(currentDs)); + if (displayed_dive.dive_site_uuid) { + displayed_dive_site = *get_dive_site_by_uuid(displayed_dive.dive_site_uuid); + } + } else if ((currentDs && dive_site_is_empty(currentDs))) { LocationInformationModel::instance()->removeRow(get_divesite_idx(currentDs)); - displayed_dive.dive_site_uuid = 0; } + resetState(); emit stopFilterDiveSite(); emit informationManagementEnded(); -- cgit v1.2.3-70-g09d2