Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-06-12 05:07:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

NOISSUE make the setup wizard use the main event loop

Browse Source 
This should fix any issues with receiving events over IPC.
This commit is contained in:
Petr Mrázek
2017-01-06 06:08:45 +01:00
parent 0249bd9eea
commit 6f17183bf0
3 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
application/MultiMC.h
View File

@ -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;