From fc0878e688ff263965efe1e91c700b9495118a19 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Sun, 30 Jun 2024 10:41:01 +0200 Subject: [PATCH] Fix midi drum config loading --- rpcs3/Emu/Cell/lv2/sys_usbd.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/rpcs3/Emu/Cell/lv2/sys_usbd.cpp b/rpcs3/Emu/Cell/lv2/sys_usbd.cpp index 3b15330e77..0557bc96b0 100644 --- a/rpcs3/Emu/Cell/lv2/sys_usbd.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_usbd.cpp @@ -240,7 +240,6 @@ usb_handler_thread::usb_handler_thread() bool found_skylander = false; bool found_infinity = false; bool found_usj = false; - bool found_rb3drums = false; for (ssize_t index = 0; index < ndev; index++) { @@ -426,20 +425,15 @@ usb_handler_thread::usb_handler_thread() usb_devices.push_back(std::make_shared(get_new_location(), device.name)); break; case midi_device_type::drums: - found_rb3drums = true; + if (!g_cfg_rb3drums.load()) + { + sys_usbd.notice("Could not load rb3drums config. Using defaults."); + } usb_devices.push_back(std::make_shared(get_new_location(), device.name)); break; } } - if (found_rb3drums) - { - if (!g_cfg_rb3drums.load()) - { - sys_usbd.notice("Could not load rb3drums config. Using defaults."); - } - } - if (g_cfg.io.ghltar == ghltar_handler::one_controller || g_cfg.io.ghltar == ghltar_handler::two_controllers) { if (!g_cfg_ghltar.load())