mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Planner: make sure stagingDive is reset to NULL

Browse source 
If we first ADD a dive and then PLAN a dive, stagingDive first was an
alias to the current_dive (for ADD) - we need to make sure that when PLAN
is started, a new dive is allocated.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-05-28 21:34:10 -07:00
parent 6576790ff6
commit ff7bff48b8
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
qt-ui/diveplanner.cpp
View file

@ -316,6 +316,8 @@ void DivePlannerWidget::decoSacChanged(const QString &decosac)
void DivePlannerPointsModel::setPlanMode(Mode m) void DivePlannerPointsModel::setPlanMode(Mode m)
{ {
mode = m; mode = m;
if (m == NOTHING)
stagingDive = NULL;
} }
bool DivePlannerPointsModel::isPlanner() 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); free(stagingDive);
stagingDive = NULL; stagingDive = NULL; // always reset the stagingDive to NULL
}
setPlanMode(NOTHING); setPlanMode(NOTHING);
diveplan.dp = NULL; diveplan.dp = NULL;
emit planCanceled(); emit planCanceled();