lux/citra
1
0
Fork 0
mirror of https://git.h3cjp.net/H3cJP/citra.git synced 2024-11-24 23:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix deallocation of GC Adapter

Browse source
This commit is contained in:
Ameer 2020-06-23 12:47:58 -04:00
parent 901bc09dd7
commit d4e07fd95e
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/input_common/gcadapter/gc_adapter.cpp
View file

@ -130,6 +130,7 @@ void Adapter::Read() {
if (payload_size != sizeof(controller_payload_copy) ||
controller_payload_copy[0] != LIBUSB_DT_HID) {
// TODO: It might be worthwhile to Shutdown GC Adapter if we encounter errors here
LOG_ERROR(Input, "error reading payload (size: %d, type: %02x)", payload_size,
controller_payload_copy[0]);
} else {
@ -200,6 +201,7 @@ void Adapter::StartScanThread() {
}
void Adapter::StopScanThread() {
detect_thread_running = false;
detect_thread.join();
}
@ -298,8 +300,6 @@ void Adapter::GetGCEndpoint(libusb_device* device) {
Adapter::~Adapter() {
StopScanThread();
Reset();
current_status = NO_ADAPTER_DETECTED;
}
void Adapter::Reset() {
@ -312,11 +312,11 @@ void Adapter::Reset() {
}
if (adapter_thread_running) {
adapter_thread_running = false;
adapter_input_thread.join();
}
adapter_controllers_status.fill(ControllerTypes::None);
current_status = NO_ADAPTER_DETECTED;
if (usb_adapter_handle) {
@ -324,6 +324,10 @@ void Adapter::Reset() {
libusb_close(usb_adapter_handle);
usb_adapter_handle = nullptr;
}
if (libusb_ctx) {
libusb_exit(libusb_ctx);
}
}
bool Adapter::DeviceConnected(int port) {

1
src/input_common/gcadapter/gc_adapter.h
View file

@ -82,7 +82,6 @@ enum {
ADAPTER_DETECTED = 1,
};
/// Singleton Adapter class
class Adapter {
public:
/// Initialize the GC Adapter capture and read sequence

3
src/input_common/main.cpp
View file

@ -59,7 +59,10 @@ void Shutdown() {
#endif
udp.reset();
Input::UnregisterFactory<Input::ButtonDevice>("gcpad");
Input::UnregisterFactory<Input::AnalogDevice>("gcpad");
gcbuttons.reset();
gcanalog.reset();
}
Keyboard* GetKeyboard() {