From eee5e812f75600f61ff498ab334499e6d625c507 Mon Sep 17 00:00:00 2001 From: Bevan Weiss Date: Wed, 5 Aug 2020 22:36:15 +1000 Subject: [PATCH] Fix for incorrect assignment of ghlguitar found_ghltar was potentially being overwritten if multiple USB devices were present --- rpcs3/Emu/Cell/lv2/sys_usbd.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rpcs3/Emu/Cell/lv2/sys_usbd.cpp b/rpcs3/Emu/Cell/lv2/sys_usbd.cpp index e88598f4f4..0f561e278a 100644 --- a/rpcs3/Emu/Cell/lv2/sys_usbd.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_usbd.cpp @@ -173,7 +173,10 @@ usb_handler_thread::usb_handler_thread() check_device(0x1415, 0x0000, 0x0000, "Singstar Microphone"); check_device(0x12BA, 0x0100, 0x0100, "Guitar Hero Guitar"); check_device(0x12BA, 0x0120, 0x0120, "Guitar Hero Drums"); - found_ghltar = check_device(0x12BA, 0x074B, 0x074B, "Guitar Hero Live Guitar"); + if (check_device(0x12BA, 0x074B, 0x074B, "Guitar Hero Live Guitar")) + { + found_ghltar = true; + } check_device(0x12BA, 0x0140, 0x0140, "DJ Hero Turntable"); check_device(0x12BA, 0x0200, 0x020F, "Harmonix Guitar");