diff options
| author | psi29a <psi29a@gmail.com> | 2022-01-07 14:35:12 +0000 |
|---|---|---|
| committer | psi29a <psi29a@gmail.com> | 2022-01-07 14:35:12 +0000 |
| commit | 011a26684abe172db5841e7761e350e3fe81b352 (patch) | |
| tree | cc39d30eb05df3f90ac7401468fbc427cddeee97 | |
| parent | 69319cea317c1796b473978248b2e837ec5c918e (diff) | |
| parent | 63a8bc5f9b3fa2280e539abe6c8ebd1a7982f875 (diff) | |
Merge branch 'fix_wizard_dialogs' into 'master'
Fix wizard dialogs
See merge request OpenMW/openmw!1519
| -rw-r--r-- | apps/wizard/mainwizard.cpp | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/apps/wizard/mainwizard.cpp b/apps/wizard/mainwizard.cpp index d92f5b029c..064f0813d8 100644 --- a/apps/wizard/mainwizard.cpp +++ b/apps/wizard/mainwizard.cpp @@ -88,8 +88,9 @@ void Wizard::MainWizard::setupLog() msgBox.setIcon(QMessageBox::Critical); msgBox.setStandardButtons(QMessageBox::Ok); msgBox.setText(mLogError.arg(file.fileName())); + connect(&msgBox, &QDialog::finished, qApp, &QApplication::quit, Qt::QueuedConnection); msgBox.exec(); - return qApp->quit(); + return; } addLogText(QString("Started OpenMW Wizard on %1").arg(QDateTime::currentDateTime().toString())); @@ -110,8 +111,9 @@ void Wizard::MainWizard::addLogText(const QString &text) msgBox.setIcon(QMessageBox::Critical); msgBox.setStandardButtons(QMessageBox::Ok); msgBox.setText(mLogError.arg(file.fileName())); + connect(&msgBox, &QDialog::finished, qApp, &QApplication::quit, Qt::QueuedConnection); msgBox.exec(); - return qApp->quit(); + return; } if (!file.isSequential()) @@ -148,8 +150,9 @@ void Wizard::MainWizard::setupGameSettings() msgBox.setIcon(QMessageBox::Critical); msgBox.setStandardButtons(QMessageBox::Ok); msgBox.setText(message.arg(file.fileName())); + connect(&msgBox, &QDialog::finished, qApp, &QApplication::quit, Qt::QueuedConnection); msgBox.exec(); - return qApp->quit(); + return; } QTextStream stream(&file); stream.setCodec(QTextCodec::codecForName("UTF-8")); @@ -177,8 +180,9 @@ void Wizard::MainWizard::setupGameSettings() msgBox.setIcon(QMessageBox::Critical); msgBox.setStandardButtons(QMessageBox::Ok); msgBox.setText(message.arg(file.fileName())); - - return qApp->quit(); + connect(&msgBox, &QDialog::finished, qApp, &QApplication::quit, Qt::QueuedConnection); + msgBox.exec(); + return; } QTextStream stream(&file); stream.setCodec(QTextCodec::codecForName("UTF-8")); @@ -210,8 +214,9 @@ void Wizard::MainWizard::setupLauncherSettings() msgBox.setIcon(QMessageBox::Critical); msgBox.setStandardButtons(QMessageBox::Ok); msgBox.setText(message.arg(file.fileName())); + connect(&msgBox, &QDialog::finished, qApp, &QApplication::quit, Qt::QueuedConnection); msgBox.exec(); - return qApp->quit(); + return; } QTextStream stream(&file); stream.setCodec(QTextCodec::codecForName("UTF-8")); @@ -394,8 +399,9 @@ void Wizard::MainWizard::writeSettings() msgBox.setText(tr("<html><head/><body><p><b>Could not create %1</b></p> \ <p>Please make sure you have the right permissions \ and try again.</p></body></html>").arg(userPath)); + connect(&msgBox, &QDialog::finished, qApp, &QApplication::quit, Qt::QueuedConnection); msgBox.exec(); - return qApp->quit(); + return; } } @@ -411,8 +417,9 @@ void Wizard::MainWizard::writeSettings() msgBox.setText(tr("<html><head/><body><p><b>Could not open %1 for writing</b></p> \ <p>Please make sure you have the right permissions \ and try again.</p></body></html>").arg(file.fileName())); + connect(&msgBox, &QDialog::finished, qApp, &QApplication::quit, Qt::QueuedConnection); msgBox.exec(); - return qApp->quit(); + return; } QTextStream stream(&file); @@ -433,8 +440,9 @@ void Wizard::MainWizard::writeSettings() msgBox.setText(tr("<html><head/><body><p><b>Could not open %1 for writing</b></p> \ <p>Please make sure you have the right permissions \ and try again.</p></body></html>").arg(file.fileName())); + connect(&msgBox, &QDialog::finished, qApp, &QApplication::quit, Qt::QueuedConnection); msgBox.exec(); - return qApp->quit(); + return; } stream.setDevice(&file); |