qt: unregister Settings' DevicesChanged callback during shutdown

fixes a crash on close
dolphin-emu · Jun 3, 2022 · 27dd2c4 · 27dd2c4
1 parent f7f47d3
commit 27dd2c4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/Source/Core/DolphinQt/MainWindow.cpp b/Source/Core/DolphinQt/MainWindow.cpp
@@ -360,6 +360,8 @@ void MainWindow::ShutdownControllers()
 {
   m_hotkey_scheduler->Stop();
 
+  Settings::Instance().UnregisterDevicesChangedCallback();
+
   Pad::Shutdown();
   Pad::ShutdownGBA();
   Keyboard::Shutdown();

diff --git a/Source/Core/DolphinQt/Settings.cpp b/Source/Core/DolphinQt/Settings.cpp
@@ -69,7 +69,7 @@ Settings::Settings()
     }
   });
 
-  g_controller_interface.RegisterDevicesChangedCallback([this] {
+  m_hotplug_callback_handle = g_controller_interface.RegisterDevicesChangedCallback([this] {
     if (Host::GetInstance()->IsHostThread())
     {
       emit DevicesChanged();
@@ -90,6 +90,11 @@ Settings::Settings()
 
 Settings::~Settings() = default;
 
+void Settings::UnregisterDevicesChangedCallback()
+{
+  g_controller_interface.UnregisterDevicesChangedCallback(m_hotplug_callback_handle);
+}
+
 Settings& Settings::Instance()
 {
   static Settings settings;

diff --git a/Source/Core/DolphinQt/Settings.h b/Source/Core/DolphinQt/Settings.h
@@ -12,6 +12,7 @@
 
 #include "Core/Config/MainSettings.h"
 #include "DiscIO/Enums.h"
+#include "InputCommon/ControllerInterface/ControllerInterface.h"
 
 namespace Core
 {
@@ -44,6 +45,8 @@ class Settings final : public QObject
 
   ~Settings();
 
+  void UnregisterDevicesChangedCallback();
+
   static Settings& Instance();
   static QSettings& GetQSettings();
 
@@ -199,10 +202,12 @@ class Settings final : public QObject
   void USBKeyboardConnectionChanged(bool connected);
 
 private:
+  Settings();
+
   bool m_batch = false;
   std::shared_ptr<NetPlay::NetPlayClient> m_client;
   std::shared_ptr<NetPlay::NetPlayServer> m_server;
-  Settings();
+  ControllerInterface::HotplugCallbackHandle m_hotplug_callback_handle;
 };
 
 Q_DECLARE_METATYPE(Core::State);