mirror of https://github.com/RPCS3/rpcs3.git
Fix midi drum config loading
This commit is contained in:
parent
352229efbd
commit
fc0878e688
|
@ -240,7 +240,6 @@ usb_handler_thread::usb_handler_thread()
|
||||||
bool found_skylander = false;
|
bool found_skylander = false;
|
||||||
bool found_infinity = false;
|
bool found_infinity = false;
|
||||||
bool found_usj = false;
|
bool found_usj = false;
|
||||||
bool found_rb3drums = false;
|
|
||||||
|
|
||||||
for (ssize_t index = 0; index < ndev; index++)
|
for (ssize_t index = 0; index < ndev; index++)
|
||||||
{
|
{
|
||||||
|
@ -426,18 +425,13 @@ usb_handler_thread::usb_handler_thread()
|
||||||
usb_devices.push_back(std::make_shared<usb_device_rb3_midi_keyboard>(get_new_location(), device.name));
|
usb_devices.push_back(std::make_shared<usb_device_rb3_midi_keyboard>(get_new_location(), device.name));
|
||||||
break;
|
break;
|
||||||
case midi_device_type::drums:
|
case midi_device_type::drums:
|
||||||
found_rb3drums = true;
|
|
||||||
usb_devices.push_back(std::make_shared<usb_device_rb3_midi_drums>(get_new_location(), device.name));
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (found_rb3drums)
|
|
||||||
{
|
|
||||||
if (!g_cfg_rb3drums.load())
|
if (!g_cfg_rb3drums.load())
|
||||||
{
|
{
|
||||||
sys_usbd.notice("Could not load rb3drums config. Using defaults.");
|
sys_usbd.notice("Could not load rb3drums config. Using defaults.");
|
||||||
}
|
}
|
||||||
|
usb_devices.push_back(std::make_shared<usb_device_rb3_midi_drums>(get_new_location(), device.name));
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (g_cfg.io.ghltar == ghltar_handler::one_controller || g_cfg.io.ghltar == ghltar_handler::two_controllers)
|
if (g_cfg.io.ghltar == ghltar_handler::one_controller || g_cfg.io.ghltar == ghltar_handler::two_controllers)
|
||||||
|
|
Loading…
Reference in New Issue