0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
application/MultiMC.cpp
View File

@ -312,8 +312,6 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv)
connect(this, SIGNAL(aboutToQuit()), SLOT(onExit()));
m_status = MultiMC::Initialized;
setIconTheme(settings()->get("IconTheme").toString());
setApplicationTheme(settings()->get("ApplicationTheme").toString());
@ -322,10 +320,22 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv)
if(SetupWizard::isRequired())
{
m_setupWizard = new SetupWizard(nullptr);
int result = m_setupWizard->exec();
qDebug() << "Wizard result =" << result;
connect(m_setupWizard, &QDialog::finished, this, &MultiMC::setupWizardFinished);
m_setupWizard->show();
return;
}
performMainStartupAction();
}
void MultiMC::setupWizardFinished(int status)
{
qDebug() << "Wizard result =" << status;
performMainStartupAction();
}
void MultiMC::performMainStartupAction()
{
m_status = MultiMC::Initialized;
if(!m_instanceIdToLaunch.isEmpty())
{
auto inst = instances()->getInstanceById(m_instanceIdToLaunch);
@ -361,6 +371,11 @@ MultiMC::~MultiMC()
void MultiMC::messageReceived(const QString& message)
{
if(status() != Initialized)
{
qDebug() << "Received message" << message << "while still initializing. It will be ignored.";
return;
}
if(message == "activate")
{
showMainWindow();

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;

1
application/main.cpp
View File

@ -33,6 +33,7 @@ int main(int argc, char *argv[])
switch (app.status())
{
case MultiMC::StartingUp:
case MultiMC::Initialized:
{
Q_INIT_RESOURCE(multimc);