External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2025-10-04 17:09:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/MultiMC/MultiMC5 into develop

Browse Source
This commit is contained in:
Sky
2013-10-06 01:13:20 +01:00
parent 2398acc9e4 f83119ce7e
commit 7aeea14a02
69 changed files with 1375 additions and 827 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gui/settingsdialog.cpp
View File

@@ -28,7 +28,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) :
{
ui->setupUi(this);
loadSettings(MMC->settings().data());
loadSettings(MMC->settings().get());
updateCheckboxStuff();
}
@@ -86,7 +86,7 @@ void SettingsDialog::on_maximizedCheckBox_clicked(bool checked)
void SettingsDialog::on_buttonBox_accepted()
{
applySettings(MMC->settings().data());
applySettings(MMC->settings().get());
}
void SettingsDialog::applySettings(SettingsObject *s)