Merge https://github.com/Forkk/MultiMC5

1 files changed, 6 insertions, 2 deletions

diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index 875cc256..8f7372c8 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -19,11 +19,14 @@
 #include <QDesktopServices>
 #include <QUrl>
 
+#include "../gui/settingsdialog.h"
+
 MainWindow::MainWindow(QWidget *parent) :
 	QMainWindow(parent),
 	ui(new Ui::MainWindow)
 {
 	ui->setupUi(this);
+	instList.loadInstances("instances");
 }
 
 MainWindow::~MainWindow()
@@ -43,7 +46,7 @@ void MainWindow::on_actionViewInstanceFolder_triggered()
 
 void MainWindow::on_actionRefresh_triggered()
 {
-	
+	instList.loadInstances("instances");
 }
 
 void MainWindow::on_actionViewCentralModsFolder_triggered()
@@ -58,7 +61,8 @@ void MainWindow::on_actionCheckUpdate_triggered()
 
 void MainWindow::on_actionSettings_triggered()
 {
-	
+	SettingsDialog dialog(this);
+	dialog.exec();
 }
 
 void MainWindow::on_actionReportBug_triggered()