diff options
author | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2012-04-03 14:55:45 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-03 09:02:23 +0200 |
commit | aeeb7e1b0ad1eb13f021aa73235a2f6d902be686 (patch) | |
tree | 92d48559fff63311084caabfff18f4a86b4e4bf1 | |
parent | 4177fc3d777953ab6559ae8577bdd1b5fa3019fb (diff) | |
download | qtsensors-aeeb7e1b0ad1eb13f021aa73235a2f6d902be686.tar.gz |
Locate the config file more reliably.
Sometimes we get an empty list.
Sometimes we get a list with an empty string.
Handle both cases.
Change-Id: Ideca4538adafd5abf21d117e99765757a7af899e
Reviewed-by: Wolfgang Beck <wolfgang.beck@nokia.com>
-rw-r--r-- | src/sensors/qsensormanager.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/sensors/qsensormanager.cpp b/src/sensors/qsensormanager.cpp index 7107c0a..351900c 100644 --- a/src/sensors/qsensormanager.cpp +++ b/src/sensors/qsensormanager.cpp @@ -93,9 +93,12 @@ public: { defaultIdentifierForTypeLoaded = true; QStringList configs = QStandardPaths::standardLocations(QStandardPaths::ConfigLocation); - // This shouldn't happen but just in case, check in /etc/xdg - if (configs.count() == 0) configs << QLatin1String("/etc/xdg"); - QString config = configs.at(configs.count()-1) + QLatin1String("/Nokia/Sensors.conf"); + // This list shouldn't be empty... but sometimes it is! + if (configs.count() == 0) configs << QString(); + QString config = configs.at(configs.count()-1); + // This variable shouldn't be empty... but sometimes it is! + if (config.isEmpty()) config = QLatin1String("/etc/xdg"); + config += QLatin1String("/Nokia/Sensors.conf"); if (!QFile::exists(config)) return; QFile cfgfile(config); if (!cfgfile.open(QFile::ReadOnly)) return; |