From bb4bf639c333bee28d398c3670f52797d726b126 Mon Sep 17 00:00:00 2001 From: "Robert C. Helling" Date: Sat, 7 Jan 2017 03:01:14 +0100 Subject: Fix deco_mode confusion We have two prefernces determining the deco_mode (BUEHLMANN vs VPMB vs RECREATIONAL): One for the planner (deco_mode) and one for displaying dives (display_deco_mode). The former is set in the planner settings while the latter is set in the preferences. This patch clears up a confusion which of the two to use by introducing a helper function that selects the correct variable. Signed-off-by: Robert C. Helling --- core/qthelper.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'core/qthelper.cpp') diff --git a/core/qthelper.cpp b/core/qthelper.cpp index 088067f26..fc9675279 100644 --- a/core/qthelper.cpp +++ b/core/qthelper.cpp @@ -1437,6 +1437,11 @@ extern "C" bool in_planner() return (currentApplicationState == "PlanDive" || currentApplicationState == "EditPlannedDive"); } +extern "C" enum deco_mode decoMode() +{ + return in_planner() ? prefs.deco_mode : prefs.display_deco_mode; +} + void init_proxy() { QNetworkProxy proxy; -- cgit v1.2.3-70-g09d2