diff --git a/ReviveOverlay/revivemanifestcontroller.cpp b/ReviveOverlay/revivemanifestcontroller.cpp index f059ad02..d6ee1692 100644 --- a/ReviveOverlay/revivemanifestcontroller.cpp +++ b/ReviveOverlay/revivemanifestcontroller.cpp @@ -335,7 +335,10 @@ bool CReviveManifestController::LaunchInjector(const QString& args) // Launch the injector with the arguments QProcess injector; injector.setProgram(QCoreApplication::applicationDirPath() + "/Revive/ReviveInjector_x64.exe"); - injector.setNativeArguments(args); + if (m_OpenXREnabled) + injector.setNativeArguments("/xr " + args); + else + injector.setNativeArguments(args); injector.start(); if (!injector.waitForFinished()) @@ -348,10 +351,7 @@ bool CReviveManifestController::LaunchSupportApp(const QString& appKey) if (!m_supportArgs.contains(appKey)) return false; - QString args = m_supportArgs[appKey]; - if (m_OpenXREnabled) - args = "/xr " + args; - return LaunchInjector(args); + return LaunchInjector(m_supportArgs[appKey]); } bool CReviveManifestController::launchApplication(const QString &canonicalName) diff --git a/ReviveOverlay/trayiconcontroller.cpp b/ReviveOverlay/trayiconcontroller.cpp index ba22c54a..489415da 100644 --- a/ReviveOverlay/trayiconcontroller.cpp +++ b/ReviveOverlay/trayiconcontroller.cpp @@ -39,7 +39,9 @@ CTrayIconController::~CTrayIconController() bool CTrayIconController::Init() { m_trayIcon = std::make_unique(QIcon(":/revive_white.ico")); - m_trayIconMenu.addAction("Enable OpenXR support", this, SLOT(openxr()))->setCheckable(true); + QAction* action = m_trayIconMenu.addAction("Enable OpenXR support"); + action->setCheckable(true); + QObject::connect(action, SIGNAL(triggered(bool)), this, SLOT(openxr(bool))); m_trayIconMenu.addSeparator(); m_trayIconMenu.addAction("&Inject...", this, SLOT(inject())); m_trayIconMenu.addAction("&Patch...", this, SLOT(patch()));