diff options
| author | skidau <skidau@gmail.com> | 2015-01-05 11:35:51 +1100 |
|---|---|---|
| committer | skidau <skidau@gmail.com> | 2015-01-05 11:35:51 +1100 |
| commit | b65d5d616566b26ee2279fbfb6ac3e112671cc31 (patch) | |
| tree | 77af52d349e1d22a54ee3826e2b026d75e86f2d4 /Source/Core | |
| parent | 1b4b8367312aed04505a15e44cc66f784bed71da (diff) | |
| parent | fffd890be3b02b49567223353792d7e3fec338f6 (diff) | |
Merge pull request #1821 from Tilka/memleak
SI_GCAdapter: properly clean up libusb
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/HW/SI_GCAdapter.cpp | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/Source/Core/Core/HW/SI_GCAdapter.cpp b/Source/Core/Core/HW/SI_GCAdapter.cpp index ca1cb8e3fe..f91960a715 100644 --- a/Source/Core/Core/HW/SI_GCAdapter.cpp +++ b/Source/Core/Core/HW/SI_GCAdapter.cpp @@ -28,6 +28,7 @@ static std::thread s_adapter_thread; static Common::Flag s_adapter_thread_running; static bool s_libusb_driver_not_supported = false; +static libusb_context* s_libusb_context = nullptr; static u8 s_endpoint_in = 0; static u8 s_endpoint_out = 0; @@ -62,7 +63,7 @@ void Init() s_controller_rumble[i] = 0; } - int ret = libusb_init(nullptr); + int ret = libusb_init(&s_libusb_context); if (ret) { @@ -176,7 +177,7 @@ void Init() void Shutdown() { - if (s_handle == nullptr || !SConfig::GetInstance().m_GameCubeAdapter) + if (!SConfig::GetInstance().m_GameCubeAdapter) return; if (s_adapter_thread_running.TestAndClear()) @@ -184,13 +185,22 @@ void Shutdown() s_adapter_thread.join(); } - libusb_close(s_handle); - s_libusb_driver_not_supported = false; + if (s_handle) + { + libusb_close(s_handle); + s_handle = nullptr; + } for (int i = 0; i < MAX_SI_CHANNELS; i++) s_controller_type[i] = CONTROLLER_NONE; - s_handle = nullptr; + if (s_libusb_context) + { + libusb_exit(s_libusb_context); + s_libusb_context = nullptr; + } + + s_libusb_driver_not_supported = false; } void Input(int chan, GCPadStatus* pad) |