summaryrefslogtreecommitdiffstats
path: root/depends/settings/inisettingsobject.cpp
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2014-03-09 23:46:46 +0100
committerPetr Mrázek <peterix@gmail.com>2014-03-09 23:46:46 +0100
commit7fd56a30bd9fba9e0a05f7267e0982be39f00616 (patch)
tree940f03e6c1ebeaf14844d9b24b7fbcd2fa987709 /depends/settings/inisettingsobject.cpp
parentb2c803a378695026f12aabc3729eb2139bee1b2c (diff)
parentf1dc4568020d222803d54fdcece324a14c9266c7 (diff)
downloadMultiMC-7fd56a30bd9fba9e0a05f7267e0982be39f00616.tar
MultiMC-7fd56a30bd9fba9e0a05f7267e0982be39f00616.tar.gz
MultiMC-7fd56a30bd9fba9e0a05f7267e0982be39f00616.tar.lz
MultiMC-7fd56a30bd9fba9e0a05f7267e0982be39f00616.tar.xz
MultiMC-7fd56a30bd9fba9e0a05f7267e0982be39f00616.zip
Merge remote-tracking branch 'origin/feature_commands' into integration_butchery
Diffstat (limited to 'depends/settings/inisettingsobject.cpp')
-rw-r--r--depends/settings/inisettingsobject.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/depends/settings/inisettingsobject.cpp b/depends/settings/inisettingsobject.cpp
index 5e52a56f..2cee8e3c 100644
--- a/depends/settings/inisettingsobject.cpp
+++ b/depends/settings/inisettingsobject.cpp
@@ -28,6 +28,11 @@ void INISettingsObject::setFilePath(const QString &filePath)
m_filePath = filePath;
}
+bool INISettingsObject::reload()
+{
+ return m_ini.loadFile(m_filePath) && SettingsObject::reload();
+}
+
void INISettingsObject::changeSetting(const Setting &setting, QVariant value)
{
if (contains(setting.id()))