Merge pull request #6062 from ligfx/fixqtcorestate

Settings: register the Core::State type with Qt
dolphin-emu · Sep 15, 2017 · 68baf7d · 68baf7d
2 parents 93574bf + 6191f04
commit 68baf7d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/Source/Core/DolphinQt2/Settings.cpp b/Source/Core/DolphinQt2/Settings.cpp
@@ -18,6 +18,7 @@
 
 Settings::Settings()
 {
+  qRegisterMetaType<Core::State>();
   Core::SetOnStateChangedCallback(
       [this](Core::State new_state) { emit EmulationStateChanged(new_state); });
 }

diff --git a/Source/Core/DolphinQt2/Settings.h b/Source/Core/DolphinQt2/Settings.h
@@ -96,3 +96,5 @@ class Settings final : public QObject
   std::unique_ptr<NetPlayServer> m_server;
   Settings();
 };
+
+Q_DECLARE_METATYPE(Core::State);