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

Conflicts:
	CMakeLists.txt

1 files changed, 38 insertions, 0 deletions

diff --git a/main.cpp b/main.cpp
new file mode 100644
index 00000000..fb75765a
--- /dev/null
+++ b/main.cpp
@@ -0,0 +1,38 @@
+#include "MultiMC.h"
+#include "gui/MainWindow.h"
+
+int main_gui(MultiMC &app)
+{
+	// show main window
+	MainWindow mainWin;
+	mainWin.restoreState(QByteArray::fromBase64(MMC->settings()->get("MainWindowState").toByteArray()));
+	mainWin.restoreGeometry(QByteArray::fromBase64(MMC->settings()->get("MainWindowGeometry").toByteArray()));
+	mainWin.show();
+	mainWin.checkSetDefaultJava();
+	auto exitCode = app.exec();
+
+	// Update if necessary.
+	if (!app.getExitUpdatePath().isEmpty())
+		app.installUpdates(app.getExitUpdatePath(), false);
+
+	return exitCode;
+}
+
+int main(int argc, char *argv[])
+{
+	// initialize Qt
+	MultiMC app(argc, argv);
+
+	Q_INIT_RESOURCE(graphics);
+	Q_INIT_RESOURCE(generated);
+
+	switch (app.status())
+	{
+	case MultiMC::Initialized:
+		return main_gui(app);
+	case MultiMC::Failed:
+		return 1;
+	case MultiMC::Succeeded:
+		return 0;
+	}
+}