From 854fa0f093f74baf28501781f45d0e0beab94ef1 Mon Sep 17 00:00:00 2001
From: spycrab <spycrab@users.noreply.github.com>
Date: Sun, 22 Apr 2018 12:49:07 +0200
Subject: [PATCH] Qt/Settings: Emit EmulationStateChanged from the UI thread

---
 Source/Core/DolphinQt2/Settings.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Source/Core/DolphinQt2/Settings.cpp b/Source/Core/DolphinQt2/Settings.cpp
index be4ca80011..d289eef494 100644
--- a/Source/Core/DolphinQt2/Settings.cpp
+++ b/Source/Core/DolphinQt2/Settings.cpp
@@ -20,8 +20,9 @@
 Settings::Settings()
 {
   qRegisterMetaType<Core::State>();
-  Core::SetOnStateChangedCallback(
-      [this](Core::State new_state) { emit EmulationStateChanged(new_state); });
+  Core::SetOnStateChangedCallback([this](Core::State new_state) {
+    QueueOnObject(this, [this, new_state] { emit EmulationStateChanged(new_state); });
+  });
 
   Config::AddConfigChangedCallback(
       [this] { QueueOnObject(this, [this] { emit ConfigChanged(); }); });