From a9c5519a7bf7122e1d11fde7499538af988cac1c Mon Sep 17 00:00:00 2001 From: Nikhil Narayana Date: Sat, 1 Jun 2024 14:27:40 -0700 Subject: [PATCH] fix: don't init jukebox if no audio output selected --- Source/Core/Core/HW/EXI_DeviceSlippi.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/HW/EXI_DeviceSlippi.cpp b/Source/Core/Core/HW/EXI_DeviceSlippi.cpp index 63d4b15677..21dff81719 100644 --- a/Source/Core/Core/HW/EXI_DeviceSlippi.cpp +++ b/Source/Core/Core/HW/EXI_DeviceSlippi.cpp @@ -3362,13 +3362,13 @@ void CEXISlippi::ConfigureJukebox() // Exclusive WASAPI and the Jukebox do not play nicely, so we just don't bother enabling // the Jukebox in that scenario - why bother doing the processing work when it's not even // possible to play it? -#ifdef _WIN32 + // Jukebox will also respect no audio output std::string backend = SConfig::GetInstance().sBackend; - if (backend.find(BACKEND_EXCLUSIVE_WASAPI) != std::string::npos) + if (backend.find(BACKEND_EXCLUSIVE_WASAPI) != std::string::npos || + backend.find(BACKEND_NULLSOUND) != std::string::npos) { return; } -#endif bool jukeboxEnabled = SConfig::GetInstance().bSlippiJukeboxEnabled; int systemVolume = SConfig::GetInstance().m_IsMuted ? 0 : SConfig::GetInstance().m_Volume;