From a329d44de091939c0a972433811e9889d1739c2c Mon Sep 17 00:00:00 2001 From: Miika Turkia Date: Wed, 20 Jan 2016 18:45:43 +0200 Subject: [PATCH] If set imperial units explicitly on mobile app If unit_system is set to imperial, we need to set the units explicitly on mobile application. Fixes #993 Signed-off-by: Miika Turkia Signed-off-by: Dirk Hohndel --- qt-mobile/qmlmanager.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/qt-mobile/qmlmanager.cpp b/qt-mobile/qmlmanager.cpp index d5e5706be..ecaca047f 100644 --- a/qt-mobile/qmlmanager.cpp +++ b/qt-mobile/qmlmanager.cpp @@ -78,6 +78,8 @@ void QMLManager::finishSetup() appendTextToLog(QString("loading dives from cache failed %1").arg(error)); } else { prefs.unit_system = informational_prefs.unit_system; + if (informational_prefs.unit_system == IMPERIAL) + informational_prefs.units = IMPERIAL_units; prefs.units = informational_prefs.units; int i; struct dive *d; @@ -299,6 +301,8 @@ void QMLManager::loadDivesWithValidCredentials() return; } prefs.unit_system = informational_prefs.unit_system; + if (informational_prefs.unit_system == IMPERIAL) + informational_prefs.units = IMPERIAL_units; prefs.units = informational_prefs.units; process_dives(false, false);