aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/config-manager.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/common/config-manager.cpp b/common/config-manager.cpp
index ca30f5bb1e..b0de2d5ee6 100644
--- a/common/config-manager.cpp
+++ b/common/config-manager.cpp
@@ -425,7 +425,10 @@ int ConfigManager::getInt(const String &key, const String &domName) const {
if (value.empty())
return 0;
- int ivalue = (int)strtol(value.c_str(), &errpos, 10);
+ // We zse the special value '0' for the base passed to strtol. Doing that
+ // makes it possible to enter hex values as "0x1234", but also decimal
+ // values ("123") are still valid.
+ int ivalue = (int)strtol(value.c_str(), &errpos, 0);
if (value.c_str() == errpos)
error("ConfigManager::getInt(%s,%s): '%s' is not a valid integer",
key.c_str(), domName.c_str(), errpos);