diff options
| author |  Anton Lundin <glance@acc.umu.se> | 2013-11-24 11:27:37 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2013-11-24 07:02:56 -0800 |
| commit | a25d351b64f311afe1d60af231bd1214b6eb4783 (patch) | |
| tree | 5cba361c0b3e919304335d31f810724bb16efb3a /statistics.c | |
| parent | ce525bd28518cc3c625b5e005bc7eb5e3c460c29 (diff) | |
| download | subsurface-a25d351b64f311afe1d60af231bd1214b6eb4783.tar.gz | |
Bugfix crash in trip statistics for non trip dives
This fixes a crash when you have non-trip dives in your logbook.
Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'statistics.c')
| -rw-r--r-- | statistics.c | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/statistics.c b/statistics.c index 13c50039b..51b8d60e2 100644 --- a/statistics.c +++ b/statistics.c @@ -155,21 +155,23 @@ void process_all_dives(struct dive *dive, struct dive **prev_dive) stats_yearly[year_iter].selection_size++; stats_yearly[year_iter].period = current_year; - if (trip_ptr != dp->divetrip) { - trip_ptr = dp->divetrip; - trip_iter++; - } + if (dp->divetrip != NULL) { + if (trip_ptr != dp->divetrip) { + trip_ptr = dp->divetrip; + trip_iter++; + } - /* stats_by_trip[0] is all the dives combined */ - stats_by_trip[0].selection_size++; - process_dive(dp, &(stats_by_trip[0])); - stats_by_trip[0].is_trip = TRUE; - stats_by_trip[0].location = strdup("All (by trip stats)"); + /* stats_by_trip[0] is all the dives combined */ + stats_by_trip[0].selection_size++; + process_dive(dp, &(stats_by_trip[0])); + stats_by_trip[0].is_trip = TRUE; + stats_by_trip[0].location = strdup("All (by trip stats)"); - process_dive(dp, &(stats_by_trip[trip_iter])); - stats_by_trip[trip_iter].selection_size++; - stats_by_trip[trip_iter].is_trip = TRUE; - stats_by_trip[trip_iter].location = dp->divetrip->location; + process_dive(dp, &(stats_by_trip[trip_iter])); + stats_by_trip[trip_iter].selection_size++; + stats_by_trip[trip_iter].is_trip = TRUE; + stats_by_trip[trip_iter].location = dp->divetrip->location; + } /* monthly statistics */ if (current_month == 0) { |