mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-08-03 06:40:25 -07:00
Compare commits
No commits in common. "9931ba0be47c6648df9f621ea756635b09739277" and "00ce2cef8a67267849730a51baed79ae7e0d2dbf" have entirely different histories.
9931ba0be4
...
00ce2cef8a
2 changed files with 4 additions and 3 deletions
2
.github/workflows/desktop-build.yml
vendored
2
.github/workflows/desktop-build.yml
vendored
|
|
@ -331,7 +331,7 @@ jobs:
|
||||||
target: 10
|
target: 10
|
||||||
runner: windows-2025
|
runner: windows-2025
|
||||||
|
|
||||||
cmake_generator: "Visual Studio 18 2026"
|
cmake_generator: "Visual Studio 17 2022"
|
||||||
cmake_generator_platform: x64
|
cmake_generator_platform: x64
|
||||||
make_package: 1
|
make_package: 1
|
||||||
package_suffix: "-Win10"
|
package_suffix: "-Win10"
|
||||||
|
|
|
||||||
|
|
@ -220,8 +220,9 @@ 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(
|
if (QProcess::startDetached(filepath.toLocalFile(),
|
||||||
QString("\"%1\" /R /D=\"%2\"").arg(filepath.toLocalFile(), QCoreApplication::applicationDirPath()))) {
|
QStringList()
|
||||||
|
<< "/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();
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue