diff options
| author | Andrew <forkk@forkk.net> | 2013-03-28 11:37:12 -0500 |
|---|---|---|
| committer | Andrew <forkk@forkk.net> | 2013-03-28 11:37:12 -0500 |
| commit | ebb2c54975e3f0b7b891532e8e72d2ef760f96c4 (patch) | |
| tree | 973de7066457a1faddffd3834eb0c260d5191ec2 /libsettings/src/setting.cpp | |
| parent | 168ed3e8e58a8e5065ffa720f8d45f4cee0f2069 (diff) | |
| parent | 1f13f0c665001a1a79f00cdad1e63e6c9802e55f (diff) | |
| download | MultiMC-ebb2c54975e3f0b7b891532e8e72d2ef760f96c4.tar MultiMC-ebb2c54975e3f0b7b891532e8e72d2ef760f96c4.tar.gz MultiMC-ebb2c54975e3f0b7b891532e8e72d2ef760f96c4.tar.lz MultiMC-ebb2c54975e3f0b7b891532e8e72d2ef760f96c4.tar.xz MultiMC-ebb2c54975e3f0b7b891532e8e72d2ef760f96c4.zip | |
Merge branch 'master' of git://github.com/peterix/MultiMC5
Conflicts:
CMakeLists.txt
gui/mainwindow.cpp
Diffstat (limited to 'libsettings/src/setting.cpp')
| -rw-r--r-- | libsettings/src/setting.cpp | 9 |
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 |