Compare commits

...

2 commits

Author SHA1 Message Date
BruebachL
9931ba0be4 [Update][NSIS] Use single string shell invocation (#6986)
Took 18 minutes

Took 2 minutes

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
(cherry picked from commit 7aaacbf347)
2026-06-11 22:19:07 -07:00
tooomm
5d2ffc8237 Use Visual Studio 2026 (#6985)
(cherry picked from commit 694adc9e64)
2026-06-11 22:19:07 -07:00
2 changed files with 3 additions and 4 deletions

View file

@ -331,7 +331,7 @@ jobs:
target: 10 target: 10
runner: windows-2025 runner: windows-2025
cmake_generator: "Visual Studio 17 2022" cmake_generator: "Visual Studio 18 2026"
cmake_generator_platform: x64 cmake_generator_platform: x64
make_package: 1 make_package: 1
package_suffix: "-Win10" package_suffix: "-Win10"

View file

@ -220,9 +220,8 @@ void DlgUpdate::downloadSuccessful(const QUrl &filepath)
{ {
setLabel(tr("Installing...")); setLabel(tr("Installing..."));
// Try to open the installer. If it opens, quit Cockatrice // Try to open the installer. If it opens, quit Cockatrice
if (QProcess::startDetached(filepath.toLocalFile(), if (QProcess::startDetached(
QStringList() QString("\"%1\" /R /D=\"%2\"").arg(filepath.toLocalFile(), QCoreApplication::applicationDirPath()))) {
<< "/R" << QString("/D=%1").arg(QCoreApplication::applicationDirPath()))) {
QMetaObject::invokeMethod(static_cast<MainWindow *>(parent()), "close", Qt::QueuedConnection); QMetaObject::invokeMethod(static_cast<MainWindow *>(parent()), "close", Qt::QueuedConnection);
qCInfo(DlgUpdateLog) << "Opened downloaded update file successfully - closing Cockatrice"; qCInfo(DlgUpdateLog) << "Opened downloaded update file successfully - closing Cockatrice";
close(); close();