From 3f739514e3fa5f3e5c64fa8172c796bd686f6e7d Mon Sep 17 00:00:00 2001
From: Ameer <aj662@drexel.edu>
Date: Thu, 25 Jun 2020 19:31:51 -0400
Subject: [PATCH] Stop reading loop if error is encountered

---
 src/input_common/gcadapter/gc_adapter.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/input_common/gcadapter/gc_adapter.cpp b/src/input_common/gcadapter/gc_adapter.cpp
index bba9bcc698..173b5c3254 100644
--- a/src/input_common/gcadapter/gc_adapter.cpp
+++ b/src/input_common/gcadapter/gc_adapter.cpp
@@ -95,7 +95,7 @@ void Adapter::Read() {
 
     while (adapter_thread_running) {
         libusb_interrupt_transfer(usb_adapter_handle, input_endpoint, adapter_payload.data(),
-                                  sizeof(adapter_payload), &payload_size_in, 32);
+                                  sizeof(adapter_payload), &payload_size_in, 16);
         payload_size_copy = 0;
         {
             std::lock_guard<std::mutex> lk(s_mutex);
@@ -106,9 +106,9 @@ void Adapter::Read() {
 
         if (payload_size_copy != sizeof(adapter_payload_copy) ||
             adapter_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_copy,
                       adapter_payload_copy[0]);
+            adapter_thread_running = false; // error reading from adapter, stop reading.
         } else {
             for (int port = 0; port < pads.size(); port++) {
                 pads[port] = GetPadStatus(port, adapter_payload_copy);
@@ -291,14 +291,14 @@ void Adapter::Reset() {
 
     if (adapter_thread_running) {
         adapter_thread_running = false;
-        adapter_input_thread.join();
     }
+    adapter_input_thread.join();
 
     adapter_controllers_status.fill(ControllerTypes::None);
     current_status = NO_ADAPTER_DETECTED;
 
     if (usb_adapter_handle) {
-        libusb_release_interface(usb_adapter_handle, 0);
+        libusb_release_interface(usb_adapter_handle, 1);
         libusb_close(usb_adapter_handle);
         usb_adapter_handle = nullptr;
     }