aboutsummaryrefslogtreecommitdiffstats
path: root/qt-ui
diff options
context:
space:
mode:
Diffstat (limited to 'qt-ui')
-rw-r--r--qt-ui/diveplanner.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp
index c3ba26932..b6fce75ca 100644
--- a/qt-ui/diveplanner.cpp
+++ b/qt-ui/diveplanner.cpp
@@ -316,6 +316,8 @@ void DivePlannerWidget::decoSacChanged(const QString &decosac)
void DivePlannerPointsModel::setPlanMode(Mode m)
{
mode = m;
+ if (m == NOTHING)
+ stagingDive = NULL;
}
bool DivePlannerPointsModel::isPlanner()
@@ -671,10 +673,9 @@ void DivePlannerPointsModel::cancelPlan()
}
}
- if (mode != ADD) {
+ if (mode != ADD) // for ADD stagingDive points at current_dive
free(stagingDive);
- stagingDive = NULL;
- }
+ stagingDive = NULL; // always reset the stagingDive to NULL
setPlanMode(NOTHING);
diveplan.dp = NULL;
emit planCanceled();