From eefa390e5f53e3124f996124c25c487da5f008ca Mon Sep 17 00:00:00 2001 From: "Robert C. Helling" Date: Mon, 27 Mar 2017 18:30:05 +0200 Subject: Handle notes in replan Upon replanning a dive, we want to delete the old dive plan in the notes and replace it with the actual. This fixes a problem when we failed to detect the old plan due to the deco model name appearing in the disclaimer that was used as a marker for the notes. This patch also adds translation markers for the deco model name strings.. Fixes #285 Signed-off-by: Robert C. Helling --- qt-models/diveplannermodel.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'qt-models') diff --git a/qt-models/diveplannermodel.cpp b/qt-models/diveplannermodel.cpp index 26e4fc1ba..c35471a44 100644 --- a/qt-models/diveplannermodel.cpp +++ b/qt-models/diveplannermodel.cpp @@ -894,8 +894,8 @@ void DivePlannerPointsModel::createPlan(bool replanCopy) 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))); + if (oldnotes.indexOf(QString(disclaimer).left(40)) >= 0) + oldnotes.truncate(oldnotes.indexOf(QString(displayed_dive.notes).left(40))); if (did_deco) oldnotes.append(displayed_dive.notes); displayed_dive.notes = strdup(oldnotes.toUtf8().data()); -- cgit v1.2.3-70-g09d2