From 6f17183bf0594f6b22ee7d2bc47150f611ee3ee2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Fri, 6 Jan 2017 06:08:45 +0100 Subject: NOISSUE make the setup wizard use the main event loop This should fix any issues with receiving events over IPC. --- application/MultiMC.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'application/MultiMC.h') diff --git a/application/MultiMC.h b/application/MultiMC.h index 50074136..846bb152 100644 --- a/application/MultiMC.h +++ b/application/MultiMC.h @@ -49,6 +49,7 @@ class MultiMC : public QApplication public: enum Status { + StartingUp, Failed, Succeeded, Initialized @@ -163,14 +164,12 @@ private slots: * Do all the things that should be done before we exit */ void onExit(); - void on_windowClose(); - void messageReceived(const QString & message); - void controllerSucceeded(); void controllerFailed(const QString & error); void analyticsSettingChanged(const Setting &setting, QVariant value); + void setupWizardFinished(int status); private: void initLogger(); @@ -185,6 +184,7 @@ private: void initMCEdit(); void initAnalytics(); void shutdownAnalytics(); + void performMainStartupAction(); private: QDateTime startTime; @@ -208,7 +208,7 @@ private: QMap> m_profilers; QString m_rootPath; - Status m_status = MultiMC::Failed; + Status m_status = MultiMC::StartingUp; // used on Windows to attach the standard IO streams bool consoleAttached = false; -- cgit v1.2.3