Qt: Fix ClearBindStateFromSource() executing on wrong thread

kamfretoz · Jul 24, 2023 · 72f7225 · 72f7225
1 parent af5f1c7
commit 72f7225
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/src/duckstation-qt/mainwindow.cpp b/src/duckstation-qt/mainwindow.cpp
@@ -690,7 +690,7 @@ void MainWindow::onApplicationStateChanged(Qt::ApplicationState state)
     // Clear the state of all keyboard binds.
     // That way, if we had a key held down, and lost focus, the bind won't be stuck enabled because we never
     // got the key release message, because it happened in another window which "stole" the event.
-    InputManager::ClearBindStateFromSource(InputManager::MakeHostKeyboardKey(0));
+    g_emu_thread->clearInputBindStateFromSource(InputManager::MakeHostKeyboardKey(0));
   }
   else
   {

diff --git a/src/duckstation-qt/qthost.cpp b/src/duckstation-qt/qthost.cpp
@@ -1065,6 +1065,17 @@ void EmuThread::reloadPostProcessingShaders()
   System::ReloadPostProcessingShaders();
 }
 
+void EmuThread::clearInputBindStateFromSource(InputBindingKey key)
+{
+  if (!isOnThread())
+  {
+    QMetaObject::invokeMethod(this, "clearInputBindStateFromSource", Qt::QueuedConnection, Q_ARG(InputBindingKey, key));
+    return;
+  }
+
+  InputManager::ClearBindStateFromSource(key);
+}
+
 void EmuThread::runOnEmuThread(std::function<void()> callback)
 {
   callback();

diff --git a/src/duckstation-qt/qthost.h b/src/duckstation-qt/qthost.h
@@ -187,6 +187,7 @@ public Q_SLOTS:
   void setCheatEnabled(quint32 index, bool enabled);
   void applyCheat(quint32 index);
   void reloadPostProcessingShaders();
+  void clearInputBindStateFromSource(InputBindingKey key);
 
 private Q_SLOTS:
   void stopInThread();