|
@@ -108,19 +108,13 @@ void startEditor(const QStringList & args)
|
|
|
#ifndef VCMI_MOBILE
|
|
|
void startExecutable(QString name, const QStringList & args)
|
|
|
{
|
|
|
+ // Start vcmiclient and vcmieditor with QProcess::start() instead of QProcess::startDetached()
|
|
|
+ // since startDetached() results in a missing terminal prompt after quitting vcmiclient.
|
|
|
+ // QProcess::start() causes the launcher window to freeze while the child process is running, so we hide it in
|
|
|
+ // MainWindow::on_startGameButton_clicked() and MainWindow::on_startEditorButton_clicked()
|
|
|
QProcess process;
|
|
|
-
|
|
|
- // Start the executable
|
|
|
- if(process.startDetached(name, args))
|
|
|
- {
|
|
|
- qApp->quit();
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- QMessageBox::critical(qApp->activeWindow(),
|
|
|
- QObject::tr("Error starting executable"),
|
|
|
- QObject::tr("Failed to start %1\nReason: %2").arg(name, process.errorString())
|
|
|
- );
|
|
|
- }
|
|
|
+ process.start(name, args);
|
|
|
+ process.waitForFinished(-1);
|
|
|
+ qApp->quit();
|
|
|
}
|
|
|
#endif
|