From 5a1a25a4760463262f52a75cbc0e57340688024b Mon Sep 17 00:00:00 2001 From: Miika Turkia Date: Sat, 30 Nov 2013 14:40:32 +0200 Subject: [PATCH] Fix a crash when no trip exists When there are no trips at all, we have to skip the Yearly statistics alltogether, including the header line (that should display all the dives added together). Signed-off-by: Miika Turkia Signed-off-by: Dirk Hohndel --- qt-ui/models.cpp | 2 +- statistics.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp index 6600bfaf6..e16312845 100644 --- a/qt-ui/models.cpp +++ b/qt-ui/models.cpp @@ -1448,7 +1448,7 @@ void YearlyStatisticsModel::update_yearly_stats() } - if (stats_by_trip != NULL ) { + if (stats_by_trip != NULL && stats_by_trip[0].is_trip == TRUE) { YearStatisticsItem *item = new YearStatisticsItem(stats_by_trip[0]); for (i = 1; stats_by_trip != NULL && stats_by_trip[i].is_trip; ++i) { YearStatisticsItem *iChild = new YearStatisticsItem(stats_by_trip[i]); diff --git a/statistics.c b/statistics.c index 807539f2a..18666bda0 100644 --- a/statistics.c +++ b/statistics.c @@ -127,7 +127,6 @@ void process_all_dives(struct dive *dive, struct dive **prev_dive) memset(stats_monthly, 0, size); memset(stats_by_trip, 0, size); stats_yearly[0].is_year = TRUE; - stats_by_trip[0].is_trip = TRUE; /* this relies on the fact that the dives in the dive_table * are in chronological order */