ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1821 from Tilka/memleak 

SI_GCAdapter: properly clean up libusb
This commit is contained in:
skidau 2015-01-05 11:35:51 +11:00
parent 1b4b836731 fffd890be3
commit b65d5d6165
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Core/Core/HW/SI_GCAdapter.cpp
View File

@ -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)