FlapJackApps/subsurface
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a crash when no trip exists

Browse Source 
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>
This commit is contained in:
Miika Turkia 2013-11-30 14:40:32 +02:00 committed by Dirk Hohndel
parent f7efc07817
commit 5a1a25a476
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qt-ui/models.cpp
View File

@ -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]);

1
statistics.c
View File

@ -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 */