From 36ae335aedbfef291afa93a911991ea8a044caf9 Mon Sep 17 00:00:00 2001 From: "Robert C. Helling" Date: Fri, 8 May 2015 23:16:55 +0200 Subject: [PATCH 2/2] Keep old notes when saving as new dive in replan ... but discard an old disclaimer and runtime table if present. Signed-off-by: Robert C. Helling --- qt-ui/diveplanner.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp index 42570da..aacca8e 100644 --- a/qt-ui/diveplanner.cpp +++ b/qt-ui/diveplanner.cpp @@ -1328,6 +1328,11 @@ void DivePlannerPointsModel::createPlan(bool replanCopy) if (current_dive->divetrip) add_dive_to_trip(copy, current_dive->divetrip); record_dive(copy); + QString oldnotes(current_dive->notes); + if (oldnotes.indexOf(QString(disclaimer)) >= 0) + oldnotes.truncate(oldnotes.indexOf(QString(disclaimer))); + oldnotes.append(displayed_dive.notes); + displayed_dive.notes = strdup(oldnotes.toUtf8().data()); } copy_dive(&displayed_dive, current_dive); } -- 1.9.5 (Apple Git-50.3)