summaryrefslogtreecommitdiffstats
path: root/gui/settingsdialog.cpp
diff options
context:
space:
mode:
authorAndrew <forkk@forkk.net>2013-02-25 14:44:36 -0600
committerAndrew <forkk@forkk.net>2013-02-25 14:44:36 -0600
commit4ca35a760dfc53fd69f0f2030868ebeda250ed59 (patch)
tree1fa312da2d051676830e222b3959a100a2fa6e05 /gui/settingsdialog.cpp
parentb56b819c35843db0d135a5bbbee5fc9916bd06df (diff)
downloadMultiMC-4ca35a760dfc53fd69f0f2030868ebeda250ed59.tar
MultiMC-4ca35a760dfc53fd69f0f2030868ebeda250ed59.tar.gz
MultiMC-4ca35a760dfc53fd69f0f2030868ebeda250ed59.tar.lz
MultiMC-4ca35a760dfc53fd69f0f2030868ebeda250ed59.tar.xz
MultiMC-4ca35a760dfc53fd69f0f2030868ebeda250ed59.zip
Fixed a lot of MSVC problems
Diffstat (limited to 'gui/settingsdialog.cpp')
-rw-r--r--gui/settingsdialog.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/gui/settingsdialog.cpp b/gui/settingsdialog.cpp
index bc10560d..7c8eacd1 100644
--- a/gui/settingsdialog.cpp
+++ b/gui/settingsdialog.cpp
@@ -27,7 +27,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) :
{
ui->setupUi(this);
- loadSettings(settings);
+ loadSettings(globalSettings);
updateCheckboxStuff();
}
@@ -84,7 +84,7 @@ void SettingsDialog::on_maximizedCheckBox_clicked(bool checked)
void SettingsDialog::on_buttonBox_accepted()
{
- applySettings(settings);
+ applySettings(globalSettings);
}
void SettingsDialog::applySettings(SettingsObject *s)