diff options
| author |  Miika Turkia <miika.turkia@gmail.com> | 2013-11-30 14:40:32 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2013-11-30 07:46:17 -0800 |
| commit | 5a1a25a4760463262f52a75cbc0e57340688024b (patch) | |
| tree | 1982688236465b984130e183963982e138b8ed4e | |
| parent | f7efc0781738b9d6a9128f6e66bfc9b47c912910 (diff) | |
| download | subsurface-5a1a25a4760463262f52a75cbc0e57340688024b.tar.gz | |
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 <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | qt-ui/models.cpp | 2 | ||||
| -rw-r--r-- | statistics.c | 1 |
2 files changed, 1 insertions, 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 */ |