dasha_uwu/PrismLauncher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 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
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)