From 3e69d066f5e9ad0a1097d806c656035398bbb7bc Mon Sep 17 00:00:00 2001 From: Michael Maltese Date: Sun, 16 Oct 2016 13:39:05 -0700 Subject: ControllerInterface: replace Reinitialize with RefreshDevices The SDL backend crashes when you close a joystick after SDL_Quit has been called. Some backends don't need to be shutdown and re-initialized everytime, we can just ask to enumerate devices again. --- Source/Core/InputCommon/ControllerInterface/Quartz/Quartz.h | 2 +- Source/Core/InputCommon/ControllerInterface/Quartz/Quartz.mm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/Core/InputCommon/ControllerInterface/Quartz') diff --git a/Source/Core/InputCommon/ControllerInterface/Quartz/Quartz.h b/Source/Core/InputCommon/ControllerInterface/Quartz/Quartz.h index 3e08410f6b..03f6ca9993 100644 --- a/Source/Core/InputCommon/ControllerInterface/Quartz/Quartz.h +++ b/Source/Core/InputCommon/ControllerInterface/Quartz/Quartz.h @@ -8,7 +8,7 @@ namespace ciface { namespace Quartz { -void Init(void* window); +void PopulateDevices(void* window); void DeInit(); } } diff --git a/Source/Core/InputCommon/ControllerInterface/Quartz/Quartz.mm b/Source/Core/InputCommon/ControllerInterface/Quartz/Quartz.mm index 6fdac0e798..a090b421a5 100644 --- a/Source/Core/InputCommon/ControllerInterface/Quartz/Quartz.mm +++ b/Source/Core/InputCommon/ControllerInterface/Quartz/Quartz.mm @@ -10,7 +10,7 @@ namespace ciface { namespace Quartz { -void Init(void* window) +void PopulateDevices(void* window) { g_controller_interface.AddDevice(std::make_shared(window)); } -- cgit v1.2.3