From a5904fcf64be40e840973194a03024a6483e30ec Mon Sep 17 00:00:00 2001 From: "Dan B (Narry)" Date: Thu, 4 Jan 2018 17:03:36 -0500 Subject: [PATCH] Workaround until https://bugs.dolphin-emu.org/issues/10764 is fixed Hopefully doesn't break anything --- Source/Core/Core/HW/SI/SI.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/HW/SI/SI.cpp b/Source/Core/Core/HW/SI/SI.cpp index afcc466bd0b4..eeabc7e8c8cb 100644 --- a/Source/Core/Core/HW/SI/SI.cpp +++ b/Source/Core/Core/HW/SI/SI.cpp @@ -559,7 +559,10 @@ void ChangeDeviceDeterministic(SIDevices device, int channel) if (GetDeviceType(channel) != device) { CoreTiming::ScheduleEvent(0, s_change_device_event, ((u64)channel << 32) | SIDEVICE_NONE); - CoreTiming::ScheduleEvent(SystemTimers::GetTicksPerSecond(), s_change_device_event, + //Narrysmod_Hijack. Do it 1 tick later so the user doesn't goof things up + //Workaround until https://bugs.dolphin-emu.org/issues/10764 is fixed + //CoreTiming::ScheduleEvent(SystemTimers::GetTicksPerSecond(), s_change_device_event, + CoreTiming::ScheduleEvent(1, s_change_device_event, ((u64)channel << 32) | device); } }