summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2014-05-28 22:16:15 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2014-05-28 22:16:15 -0700
commitb37422c4478825f679e05cb19ed22184b6172d44 (patch)
treec9ef3e9d4cfe8870bd7033bceda2cce6988a06ec
parent03eba8f99d414d455b2ce04d8a04bd8177bd0358 (diff)
downloadsubsurface-b37422c4478825f679e05cb19ed22184b6172d44.tar.gz
Planner: record the new dive at the correct time
We don't want to do this when calling plan() from createTemporaryPlan() - we only want to record the dive at the end of createPlan(). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--planner.c2
-rw-r--r--qt-ui/diveplanner.cpp1
2 files changed, 1 insertions, 2 deletions
diff --git a/planner.c b/planner.c
index 746a40d32..7bdb60e62 100644
--- a/planner.c
+++ b/planner.c
@@ -769,8 +769,6 @@ void plan(struct diveplan *diveplan, char **cached_datap, struct dive **divep, b
*divep = dive = create_dive_from_plan(diveplan);
if (!dive)
goto error_exit;
- record_dive(dive);
-
add_plan_to_notes(diveplan, dive);
error_exit:
diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp
index fd6eee504..921fdf88b 100644
--- a/qt-ui/diveplanner.cpp
+++ b/qt-ui/diveplanner.cpp
@@ -871,6 +871,7 @@ void DivePlannerPointsModel::createPlan()
cyl->end.mbar = 0;
}
}
+ record_dive(tempDive);
mark_divelist_changed(true);
// Remove and clean the diveplan, so we don't delete