diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-09-22 14:03:05 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-09-22 14:03:05 +0200 |
| commit | 1bed5e4023f503cb95a914c1e6886e045b7f34e2 (patch) | |
| tree | 6c2a2eb34b93bdd24e7db1f9378b231084c0b27a /gui/settingsdialog.cpp | |
| parent | 930b07afd4229e952d0cd47ca62cd94235499a0c (diff) | |
| parent | 9d03a9c1e3b9c24a4146adedb2971591d23b037a (diff) | |
| download | MultiMC-1bed5e4023f503cb95a914c1e6886e045b7f34e2.tar MultiMC-1bed5e4023f503cb95a914c1e6886e045b7f34e2.tar.gz MultiMC-1bed5e4023f503cb95a914c1e6886e045b7f34e2.tar.lz MultiMC-1bed5e4023f503cb95a914c1e6886e045b7f34e2.tar.xz MultiMC-1bed5e4023f503cb95a914c1e6886e045b7f34e2.zip | |
Merge branch 'feature_onesix_forge' into develop
Diffstat (limited to 'gui/settingsdialog.cpp')
| -rw-r--r-- | gui/settingsdialog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gui/settingsdialog.cpp b/gui/settingsdialog.cpp index a5283b36..9736c1c7 100644 --- a/gui/settingsdialog.cpp +++ b/gui/settingsdialog.cpp @@ -27,7 +27,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) : { ui->setupUi(this); - loadSettings(MMC->settings()); + loadSettings(MMC->settings().data()); updateCheckboxStuff(); } @@ -85,7 +85,7 @@ void SettingsDialog::on_maximizedCheckBox_clicked(bool checked) void SettingsDialog::on_buttonBox_accepted() { - applySettings(MMC->settings()); + applySettings(MMC->settings().data()); } void SettingsDialog::applySettings(SettingsObject *s) |