From 08c42813e5d3af8ca702be4333daf46cc14c1d39 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Fri, 3 Feb 2017 07:31:03 -0800 Subject: Revert "In statistics, ignore gas use of planned dives" This reverts commit 1d8662006cbb5edae941315e30ede381c23a817b. Mistakenly pushed to master Signed-off-by: Dirk Hohndel --- desktop-widgets/divelogexportdialog.cpp | 2 +- desktop-widgets/maintab.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'desktop-widgets') diff --git a/desktop-widgets/divelogexportdialog.cpp b/desktop-widgets/divelogexportdialog.cpp index 8b7cac192..7b315fcf0 100644 --- a/desktop-widgets/divelogexportdialog.cpp +++ b/desktop-widgets/divelogexportdialog.cpp @@ -277,7 +277,7 @@ void DiveLogExportDialog::export_TeX(const char *filename, const bool selected_o int i; for (i = 0; i < MAX_CYLINDERS; i++) - if (is_cylinder_used(dive, i, false)) + if (is_cylinder_used(dive, i)) delta_p.mbar += dive->cylinder[i].start.mbar - dive->cylinder[i].end.mbar; if (need_pagebreak) diff --git a/desktop-widgets/maintab.cpp b/desktop-widgets/maintab.cpp index b8bdf44a7..f6e5b7dc6 100644 --- a/desktop-widgets/maintab.cpp +++ b/desktop-widgets/maintab.cpp @@ -594,7 +594,7 @@ void MainTab::updateDiveInfo(bool clear) gaslist = ""; SACs = ""; volumes = ""; separator = ""; for (int i = 0; i < MAX_CYLINDERS; i++) { - if (!is_cylinder_used(&displayed_dive, i, false)) + if (!is_cylinder_used(&displayed_dive, i)) continue; gaslist.append(separator); volumes.append(separator); SACs.append(separator); separator = "\n"; -- cgit v1.2.3-70-g09d2