diff options
| author | Petr Mrázek <peterix@gmail.com> | 2017-01-06 06:08:45 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2017-01-06 06:08:45 +0100 |
| commit | 6f17183bf0594f6b22ee7d2bc47150f611ee3ee2 (patch) | |
| tree | e451b8027a43afa63535c812d8c9382ce16026a8 /application/MultiMC.h | |
| parent | 0249bd9eea450026c002481dadf945cb0268143f (diff) | |
| download | MultiMC-6f17183bf0594f6b22ee7d2bc47150f611ee3ee2.tar MultiMC-6f17183bf0594f6b22ee7d2bc47150f611ee3ee2.tar.gz MultiMC-6f17183bf0594f6b22ee7d2bc47150f611ee3ee2.tar.lz MultiMC-6f17183bf0594f6b22ee7d2bc47150f611ee3ee2.tar.xz MultiMC-6f17183bf0594f6b22ee7d2bc47150f611ee3ee2.zip | |
NOISSUE make the setup wizard use the main event loop
This should fix any issues with receiving events over IPC.
Diffstat (limited to 'application/MultiMC.h')
| -rw-r--r-- | application/MultiMC.h | 8 |
1 files changed, 4 insertions, 4 deletions
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<QString, std::shared_ptr<BaseProfilerFactory>> 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; |