redstrate/astra
1
Fork 0
mirror of https://github.com/redstrate/Astra.git synced 2025-04-23 04:57:44 +00:00
Code Activity

Fix Watchdog builds failing

Browse source
This commit is contained in:
Joshua Goins 2022-09-05 17:17:38 -04:00
parent aaa614519e
commit cd2723ebfb
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
launcher/core/src/launchercore.cpp
View file

@ -65,7 +65,7 @@ void LauncherCore::buildRequest(const ProfileSettings& settings, QNetworkRequest
void LauncherCore::launchGame(const ProfileSettings& profile, const LoginAuth& auth) { void LauncherCore::launchGame(const ProfileSettings& profile, const LoginAuth& auth) {
#ifdef ENABLE_WATCHDOG #ifdef ENABLE_WATCHDOG
if (info.settings->enableWatchdog) { if (profile.enableWatchdog) {
watchdog->launchGame(profile, auth); watchdog->launchGame(profile, auth);
} else { } else {
beginGameExecutable(profile, auth); beginGameExecutable(profile, auth);
@ -326,7 +326,7 @@ void LauncherCore::readInitialInformation() {
profileSettings.resize(profiles.size()); profileSettings.resize(profiles.size());
for (const auto& uuid : profiles) { for (const auto& uuid : profiles) {
ProfileSettings* profile = new ProfileSettings(); auto profile = new ProfileSettings();
profile->uuid = QUuid(uuid); profile->uuid = QUuid(uuid);
settings.beginGroup(uuid); settings.beginGroup(uuid);

2
launcher/desktop/src/settingswindow.cpp
View file

@ -350,7 +350,7 @@ void SettingsWindow::setupGameTab(QFormLayout& layout) {
#ifdef ENABLE_WATCHDOG #ifdef ENABLE_WATCHDOG
enableWatchdog = new QCheckBox("Enable Watchdog (X11 only)"); enableWatchdog = new QCheckBox("Enable Watchdog (X11 only)");
gameBoxLayout->addWidget(enableWatchdog); layout.addWidget(enableWatchdog);
connect(enableWatchdog, &QCheckBox::stateChanged, [this](int state) { connect(enableWatchdog, &QCheckBox::stateChanged, [this](int state) {
getCurrentProfile().enableWatchdog = state; getCurrentProfile().enableWatchdog = state;