mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix deco_mode confusion

Browse source 
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>
This commit is contained in:
Robert C. Helling 2017-01-07 03:01:14 +01:00 • committed by Subsurface
parent 4e375f56a8
commit bb4bf639c3
8 changed files with 36 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

5
core/qthelper.cpp
View file

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