diff --git a/src/xenia/app/emulator_window.cc b/src/xenia/app/emulator_window.cc index 9b0789978..9f0f8766b 100644 --- a/src/xenia/app/emulator_window.cc +++ b/src/xenia/app/emulator_window.cc @@ -1870,24 +1870,6 @@ void EmulatorWindow::ToggleGPUSetting(gpu_cvar value) { } } -// Determine if the Xbox Gamebar is enabled via the Windows registry -bool EmulatorWindow::IsUseNexusForGameBarEnabled() { -#ifdef _WIN32 - const LPCWSTR reg_path = L"SOFTWARE\\Microsoft\\GameBar"; - const LPCWSTR key = L"UseNexusForGameBarEnabled"; - - DWORD value = 0; - DWORD dataSize = sizeof(value); - - RegGetValue(HKEY_CURRENT_USER, reg_path, key, RRF_RT_DWORD, nullptr, &value, - &dataSize); - - return (bool)value; -#else - return false; -#endif -} - void EmulatorWindow::DisplayHotKeysConfig() { std::string msg = ""; std::string msg_passthru = ""; diff --git a/src/xenia/app/emulator_window.h b/src/xenia/app/emulator_window.h index 6c81dd828..945991465 100644 --- a/src/xenia/app/emulator_window.h +++ b/src/xenia/app/emulator_window.h @@ -236,7 +236,6 @@ class EmulatorWindow { bool vibrate = true); void GamepadHotKeys(); void ToggleGPUSetting(gpu_cvar index); - bool IsUseNexusForGameBarEnabled(); void DisplayHotKeysConfig(); static std::string CanonicalizeFileExtension( diff --git a/src/xenia/base/system.h b/src/xenia/base/system.h index 519d954e1..b26dc4378 100644 --- a/src/xenia/base/system.h +++ b/src/xenia/base/system.h @@ -29,6 +29,9 @@ void LaunchFileExplorer(const std::filesystem::path& path); bool SetProcessPriorityClass(const uint32_t priority_class); +// Determine if the Xbox Gamebar is enabled via the Windows registry +bool IsUseNexusForGameBarEnabled(); + enum class SimpleMessageBoxType { Help, Warning, diff --git a/src/xenia/base/system_android.cc b/src/xenia/base/system_android.cc index 262c9d419..bc8423274 100644 --- a/src/xenia/base/system_android.cc +++ b/src/xenia/base/system_android.cc @@ -296,4 +296,5 @@ void ShowSimpleMessageBox(SimpleMessageBoxType type, std::string_view message) { bool SetProcessPriorityClass(const uint32_t priority_class) { return true; } +bool IsUseNexusForGameBarEnabled() { return false; } } // namespace xe diff --git a/src/xenia/base/system_gnulinux.cc b/src/xenia/base/system_gnulinux.cc index a5421241f..e9b0b5297 100644 --- a/src/xenia/base/system_gnulinux.cc +++ b/src/xenia/base/system_gnulinux.cc @@ -69,4 +69,5 @@ void ShowSimpleMessageBox(SimpleMessageBoxType type, std::string_view message) { bool SetProcessPriorityClass(const uint32_t priority_class) { return true; } +bool IsUseNexusForGameBarEnabled() { return false; } } // namespace xe diff --git a/src/xenia/base/system_win.cc b/src/xenia/base/system_win.cc index cd0ae622d..3b0f14a03 100644 --- a/src/xenia/base/system_win.cc +++ b/src/xenia/base/system_win.cc @@ -64,4 +64,17 @@ bool SetProcessPriorityClass(const uint32_t priority_class) { xeniaToWindowsPriorityClassMapping[priority_class]); } +bool IsUseNexusForGameBarEnabled() { + const LPCWSTR reg_path = L"SOFTWARE\\Microsoft\\GameBar"; + const LPCWSTR key = L"UseNexusForGameBarEnabled"; + + DWORD value = 0; + DWORD dataSize = sizeof(value); + + RegGetValue(HKEY_CURRENT_USER, reg_path, key, RRF_RT_DWORD, nullptr, &value, + &dataSize); + + return static_cast(value); +} + } // namespace xe