games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-10 22:31:40 +02:00
Code Issues Releases Activity

Merge pull request #5584 from kambala-decapitator/macos-launcher-quit

Browse Source 
[launcher] restore quitting launcher when starting game on Windows and macOS
This commit is contained in:
Ivan Savenko
2025-03-26 16:48:32 +02:00
committed by GitHub
parent 356eaae716 602616f38f
commit 3ca0c7661a
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
launcher/main.cpp
View File

@@ -108,21 +108,36 @@ void startEditor(const QStringList & args)
#ifndef VCMI_MOBILE
void startExecutable(QString name, const QStringList & args)
{
QProcess process;
auto showError = [&] {
QMessageBox::critical(qApp->activeWindow(),
QObject::tr("Error starting executable"),
QObject::tr("Failed to start %1\nReason: %2").arg(name, process.errorString()));
};
#if defined(VCMI_MAC) || defined(VCMI_WINDOWS)
if(process.startDetached(name, args))
{
qApp->quit();
}
else
{
showError();
}
#else // Linux
// 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;
process.setProcessChannelMode(QProcess::ForwardedChannels);
process.start(name, args);
process.waitForFinished(-1);
if (process.exitStatus() != QProcess::NormalExit || process.exitCode() != 0) {
QMessageBox::critical(qApp->activeWindow(),
QObject::tr("Error starting executable"),
QObject::tr("Failed to start %1\nReason: %2").arg(name, process.errorString()));
showError();
}
qApp->quit();
#endif
}
#endif