From 218ea948316fe9e1581935becac8f1225d16e955 Mon Sep 17 00:00:00 2001 From: Oliver Schwaneberg Date: Sun, 4 Feb 2018 23:17:58 +0100 Subject: Bugfix in plannermodel for very short dive durations When adding a dive manually, you might clear the "duration" field and fill in your value by hand. Unfortunately, commit #1052 produced a bug that practically limited the dive duration to 6 minutes once the field was cleared. Signed-off-by: Oliver Schwaneberg --- CHANGELOG.md | 1 + qt-models/diveplannermodel.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e00048ab..139662a44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ +- Fix bug that alters manually entered dive durations - Desktop: don't ignore seconds in duration input field - Libdivecomputer: use a new version - Dekstop: fix instability crashes in reverse geo lookup function diff --git a/qt-models/diveplannermodel.cpp b/qt-models/diveplannermodel.cpp index 43ab20de3..17d21fe64 100644 --- a/qt-models/diveplannermodel.cpp +++ b/qt-models/diveplannermodel.cpp @@ -108,7 +108,7 @@ void DivePlannerPointsModel::loadFromDive(dive *d) int cylinderid = 0; last_sp.mbar = 0; for (int i = 0; i < plansamples - 1; i++) { - if (dc->last_manual_time.seconds && lasttime.seconds >= dc->last_manual_time.seconds) + if (dc->last_manual_time.seconds && dc->last_manual_time.seconds > 120 && lasttime.seconds >= dc->last_manual_time.seconds) break; while (j * plansamples <= i * dc->samples) { const sample &s = dc->sample[j]; -- cgit v1.2.3-70-g09d2