piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 13:27:45 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

address comment (move callback deregister to quit guard)

Browse Source
This commit is contained in:
dreamsyntax 2024-11-04 00:32:50 -07:00
parent 7b2b6d7a32
commit 3ec5454b10
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp
View File

@ -296,7 +296,6 @@ private:
Uint32 m_stop_event_type; Uint32 m_stop_event_type;
Uint32 m_populate_event_type; Uint32 m_populate_event_type;
std::thread m_hotplug_thread; std::thread m_hotplug_thread;
Config::ConfigChangedCallbackID m_config_changed_callback_id;
}; };
std::unique_ptr<ciface::InputBackend> CreateInputBackend(ControllerInterface* controller_interface) std::unique_ptr<ciface::InputBackend> CreateInputBackend(ControllerInterface* controller_interface)
@ -438,11 +437,13 @@ InputBackend::InputBackend(ControllerInterface* controller_interface)
// We want buttons to come in as positions, not labels // We want buttons to come in as positions, not labels
SDL_SetHint(SDL_HINT_GAMECONTROLLER_USE_BUTTON_LABELS, "0"); SDL_SetHint(SDL_HINT_GAMECONTROLLER_USE_BUTTON_LABELS, "0");
m_config_changed_callback_id = Config::AddConfigChangedCallback([this] { SetPS5PlayerLED(); }); const Config::ConfigChangedCallbackID config_changed_callback_id =
Config::AddConfigChangedCallback([this] { SetPS5PlayerLED(); });
SetPS5PlayerLED(); SetPS5PlayerLED();
m_hotplug_thread = std::thread([this] { m_hotplug_thread = std::thread([this, config_changed_callback_id] {
Common::ScopeGuard quit_guard([] { Common::ScopeGuard quit_guard([config_changed_callback_id] {
Config::RemoveConfigChangedCallback(config_changed_callback_id);
// TODO: there seems to be some sort of memory leak with SDL, quit isn't freeing everything up // TODO: there seems to be some sort of memory leak with SDL, quit isn't freeing everything up
SDL_Quit(); SDL_Quit();
}); });
@ -516,7 +517,6 @@ InputBackend::~InputBackend()
if (!m_hotplug_thread.joinable()) if (!m_hotplug_thread.joinable())
return; return;
Config::RemoveConfigChangedCallback(m_config_changed_callback_id);
SDL_Event stop_event{m_stop_event_type}; SDL_Event stop_event{m_stop_event_type};
SDL_PushEvent(&stop_event); SDL_PushEvent(&stop_event);