From 84f9911163aadf12322243c04433e096154be65b Mon Sep 17 00:00:00 2001 From: Megamouse Date: Tue, 3 Dec 2019 00:55:07 +0100 Subject: [PATCH] Qt: skip in-game Qt dialogs if no-gui was used --- rpcs3/rpcs3qt/gui_application.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rpcs3/rpcs3qt/gui_application.cpp b/rpcs3/rpcs3qt/gui_application.cpp index dfea4c60b5..7c30fb47c2 100644 --- a/rpcs3/rpcs3qt/gui_application.cpp +++ b/rpcs3/rpcs3qt/gui_application.cpp @@ -180,10 +180,10 @@ void gui_application::InitializeCallbacks() }; callbacks.get_gs_frame = [this]() -> std::unique_ptr { return get_gs_frame(); }; - callbacks.get_msg_dialog = [this]() -> std::shared_ptr { return std::make_shared(); }; - callbacks.get_osk_dialog = []() -> std::shared_ptr { return std::make_shared(); }; - callbacks.get_save_dialog = []() -> std::unique_ptr { return std::make_unique(); }; - callbacks.get_trophy_notification_dialog = [this]() -> std::unique_ptr { return std::make_unique(m_game_window); }; + callbacks.get_msg_dialog = [this]() -> std::shared_ptr { return m_show_gui ? std::make_shared() : nullptr; }; + callbacks.get_osk_dialog = [this]() -> std::shared_ptr { return m_show_gui ? std::make_shared() : nullptr; }; + callbacks.get_save_dialog = [this]() -> std::unique_ptr { return m_show_gui ? std::make_unique() : nullptr; }; + callbacks.get_trophy_notification_dialog = [this]() -> std::unique_ptr { return m_show_gui ? std::make_unique(m_game_window) : nullptr; }; callbacks.on_run = [=]() { OnEmulatorRun(); }; callbacks.on_pause = [=]() { OnEmulatorPause(); };