From 45cc15100cf1f3bd1574edd9baecfa14b7526176 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 9 Apr 2015 05:46:07 +0200 Subject: [PATCH] (xinput_joypad.c) Call dylib_close --- input/drivers_joypad/xinput_joypad.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/input/drivers_joypad/xinput_joypad.c b/input/drivers_joypad/xinput_joypad.c index b3854b96c9..41855e84af 100644 --- a/input/drivers_joypad/xinput_joypad.c +++ b/input/drivers_joypad/xinput_joypad.c @@ -202,7 +202,7 @@ static bool xinput_joypad_init(void) if (!g_XInputGetStateEx) { RARCH_ERR("Failed to init XInput: DLL is invalid or corrupt.\n"); - FreeLibrary(g_xinput_dll); + dylib_close(g_xinput_dll); return false; /* DLL was loaded but did not contain the correct function. */ } RARCH_WARN("XInput: No guide button support.\n"); @@ -212,7 +212,7 @@ static bool xinput_joypad_init(void) if (!g_XInputSetState) { RARCH_ERR("Failed to init XInput: DLL is invalid or corrupt.\n"); - FreeLibrary(g_xinput_dll); + dylib_close(g_xinput_dll); return false; /* DLL was loaded but did not contain the correct function. */ } @@ -280,13 +280,14 @@ static void xinput_joypad_destroy(void) for (i = 0; i < 4; ++i) memset(&g_xinput_states[i], 0, sizeof(xinput_joypad_state)); - FreeLibrary(g_xinput_dll); + dylib_close(g_xinput_dll); - g_xinput_dll = NULL; - g_XInputGetStateEx = NULL; - g_XInputSetState = NULL; + g_xinput_dll = NULL; + g_XInputGetStateEx = NULL; + g_XInputSetState = NULL; dinput_joypad.destroy(); + g_xinput_block_pads = false; }