diff options
| author |  Robert C. Helling <helling@atdotde.de> | 2017-01-07 03:01:14 +0100 |
|---|---|---|
| committer |  Subsurface <dirk@subsurface-divelog.org> | 2017-01-06 20:43:23 -0800 |
| commit | bb4bf639c333bee28d398c3670f52797d726b126 (patch) | |
| tree | c28fe4eb2f51dc226931ee16e58edade6bf644ea /core/qthelper.cpp | |
| parent | 4e375f56a8b15212b96e0ce5b7ca4724dc268612 (diff) | |
| download | subsurface-bb4bf639c333bee28d398c3670f52797d726b126.tar.gz | |
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 <helling@atdotde.de>
Diffstat (limited to 'core/qthelper.cpp')
| -rw-r--r-- | core/qthelper.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
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; |