summaryrefslogtreecommitdiffstats
path: root/libsettings/src/setting.cpp
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2013-03-24 15:36:00 +0100
committerPetr Mrázek <peterix@gmail.com>2013-03-24 15:36:00 +0100
commit40570c321069b832722b807227fd8ff9bbd7c10d (patch)
treec29a37baba94726c27ef2c19ab3d81980cb43abb /libsettings/src/setting.cpp
parente4f86893a899ee86cfa6d238f891bec04977c966 (diff)
downloadMultiMC-40570c321069b832722b807227fd8ff9bbd7c10d.tar
MultiMC-40570c321069b832722b807227fd8ff9bbd7c10d.tar.gz
MultiMC-40570c321069b832722b807227fd8ff9bbd7c10d.tar.lz
MultiMC-40570c321069b832722b807227fd8ff9bbd7c10d.tar.xz
MultiMC-40570c321069b832722b807227fd8ff9bbd7c10d.zip
Fix settings objects, instances can be started from the GUI now
Diffstat (limited to 'libsettings/src/setting.cpp')
-rw-r--r--libsettings/src/setting.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/libsettings/src/setting.cpp b/libsettings/src/setting.cpp
index a224ad39..1a4f9e13 100644
--- a/libsettings/src/setting.cpp
+++ b/libsettings/src/setting.cpp
@@ -26,9 +26,16 @@ QVariant Setting::get() const
{
SettingsObject *sbase = qobject_cast<SettingsObject *>(parent());
if (!sbase)
+ {
return defValue();
+ }
else
- return sbase->retrieveValue(*this);
+ {
+ QVariant test = sbase->retrieveValue(*this);
+ if(!test.isValid())
+ return defValue();
+ return test;
+ }
}
QVariant Setting::defValue() const