summaryrefslogtreecommitdiffstats
path: root/gui
diff options
context:
space:
mode:
Diffstat (limited to 'gui')
-rw-r--r--gui/mainwindow.cpp6
-rw-r--r--gui/settingsdialog.cpp4
2 files changed, 5 insertions, 5 deletions
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index 87661da6..447a6619 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -53,7 +53,7 @@ void openInDefaultProgram(QString filename);
MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent),
ui(new Ui::MainWindow),
- instList(settings->get("InstanceDir").toString())
+ instList(globalSettings->get("InstanceDir").toString())
{
ui->setupUi(this);
@@ -78,7 +78,7 @@ void MainWindow::on_actionAddInstance_triggered()
void MainWindow::on_actionViewInstanceFolder_triggered()
{
- openInDefaultProgram(settings->get("InstanceDir").toString());
+ openInDefaultProgram(globalSettings->get("InstanceDir").toString());
}
void MainWindow::on_actionRefresh_triggered()
@@ -88,7 +88,7 @@ void MainWindow::on_actionRefresh_triggered()
void MainWindow::on_actionViewCentralModsFolder_triggered()
{
- openInDefaultProgram(settings->get("CentralModsDir").toString());
+ openInDefaultProgram(globalSettings->get("CentralModsDir").toString());
}
void MainWindow::on_actionCheckUpdate_triggered()
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)