jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-30 18:43:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use ShellExecuteExW for Windows update.

Browse source 
Took 3 minutes

Took 5 seconds

Took 30 seconds

Took 19 seconds
This commit is contained in:
Lukas Brübach 2026-06-12 08:45:57 +02:00
parent 7aaacbf347
commit 7fa6de1bf2
1 changed files with 26 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

29
cockatrice/src/interface/widgets/dialogs/dlg_update.cpp
View file

@ -13,6 +13,9 @@
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QtNetwork> #include <QtNetwork>
#include <version_string.h> #include <version_string.h>
#if defined(Q_OS_WIN)
#include <windows.h>
#endif
DlgUpdate::DlgUpdate(QWidget *parent) : QDialog(parent) DlgUpdate::DlgUpdate(QWidget *parent) : QDialog(parent)
{ {
@ -219,9 +222,29 @@ void DlgUpdate::downloadError(const QString &errorString)
void DlgUpdate::downloadSuccessful(const QUrl &filepath) void DlgUpdate::downloadSuccessful(const QUrl &filepath)
{ {
setLabel(tr("Installing...")); setLabel(tr("Installing..."));
// Try to open the installer. If it opens, quit Cockatrice
if (QProcess::startDetached( const QString installer = filepath.toLocalFile();
QString("\"%1\" /R /D=\"%2\"").arg(filepath.toLocalFile(), QCoreApplication::applicationDirPath()))) { const QString args = QString("/R /D=\"%1\"").arg(QCoreApplication::applicationDirPath());
bool launched = false;
#if defined(Q_OS_WIN)
SHELLEXECUTEINFOW sei = {};
sei.cbSize = sizeof(sei);
sei.fMask = SEE_MASK_NOCLOSEPROCESS;
sei.lpVerb = L"runas";
sei.lpFile = reinterpret_cast<LPCWSTR>(installer.utf16());
sei.lpParameters = reinterpret_cast<LPCWSTR>(args.utf16());
sei.nShow = SW_SHOWNORMAL;
launched = ShellExecuteExW(&sei);
if (launched && sei.hProcess) {
CloseHandle(sei.hProcess);
}
#else
launched = QProcess::startDetached(installer, {"/R", QString("/D=%1").arg(QCoreApplication::applicationDirPath())});
#endif
if (launched) {
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();