From de13ae47530001b0114d6c4e216de9ee8ba65ae1 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Sun, 9 Aug 2026 11:42:38 +0200 Subject: [PATCH] Initialize emu callbacks before initializing the emulator --- rpcs3/headless_application.cpp | 6 +++--- rpcs3/rpcs3qt/gui_application.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rpcs3/headless_application.cpp b/rpcs3/headless_application.cpp index fc72801da..a4577c694 100644 --- a/rpcs3/headless_application.cpp +++ b/rpcs3/headless_application.cpp @@ -23,12 +23,12 @@ headless_application::headless_application(int& argc, char** argv) : QCoreApplic bool headless_application::Init() { - // Force init the emulator - InitializeEmulator(m_active_user.empty() ? "00000001" : m_active_user, false, true); - // Create callbacks from the emulator, which reference the handlers. InitializeCallbacks(); + // Force init the emulator + InitializeEmulator(m_active_user.empty() ? "00000001" : m_active_user, false, true); + // Create connects to propagate events throughout Gui. InitializeConnects(); diff --git a/rpcs3/rpcs3qt/gui_application.cpp b/rpcs3/rpcs3qt/gui_application.cpp index e24696eb9..3c9718f6f 100644 --- a/rpcs3/rpcs3qt/gui_application.cpp +++ b/rpcs3/rpcs3qt/gui_application.cpp @@ -171,12 +171,12 @@ bool gui_application::Init() m_active_user = m_persistent_settings->GetCurrentUser("00000001").toStdString(); } - // Force init the emulator - InitializeEmulator(m_active_user, m_show_gui, false); - // Create callbacks from the emulator, which reference the handlers. InitializeCallbacks(); + // Force init the emulator + InitializeEmulator(m_active_user, m_show_gui, false); + // Create connects to propagate events throughout Gui. InitializeConnects();