From 02287189426c0d3e7873e2dd58d2af92068607ba Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" Date: Sun, 27 Nov 2011 14:49:30 +0100 Subject: preferences read out: when no unit is specified, assume it is in the requested units Fixed bugs: - https://launchpad.net/bugs/799848 (bzr r10752) --- src/preferences.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/preferences.cpp') diff --git a/src/preferences.cpp b/src/preferences.cpp index 2a3019d28..4615fd6e1 100644 --- a/src/preferences.cpp +++ b/src/preferences.cpp @@ -770,7 +770,12 @@ double Preferences::_extractDouble(Entry const &v, Glib::ustring const &requeste double val = _extractDouble(v); Glib::ustring unit = _extractUnit(v); - return val * (unit_table.getUnit(unit).factor / unit_table.getUnit(requested_unit).factor); + if (unit.length() == 0) { + // no unit specified, don't do conversion + return val; + } else { + return val * (unit_table.getUnit(unit).factor / unit_table.getUnit(requested_unit).factor); + } } Glib::ustring Preferences::_extractString(Entry const &v) -- cgit v1.2.3