archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-05 06:21:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Qt: show welcome dialog before showing the app

Browse source 
Fixes interference with update manager
This commit is contained in:
Megamouse 2020-03-22 14:49:49 +01:00
parent 13e166084d
commit 532215fb81
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
rpcs3/rpcs3qt/gui_application.cpp
View file

@ -69,17 +69,17 @@ void gui_application::Init()
// Create connects to propagate events throughout Gui. // Create connects to propagate events throughout Gui.
InitializeConnects(); InitializeConnects();
if (m_main_window)
{
m_main_window->Init();
}
if (m_gui_settings->GetValue(gui::ib_show_welcome).toBool()) if (m_gui_settings->GetValue(gui::ib_show_welcome).toBool())
{ {
welcome_dialog* welcome = new welcome_dialog(); welcome_dialog* welcome = new welcome_dialog();
welcome->exec(); welcome->exec();
} }
if (m_main_window)
{
m_main_window->Init();
}
#ifdef WITH_DISCORD_RPC #ifdef WITH_DISCORD_RPC
// Discord Rich Presence Integration // Discord Rich Presence Integration
if (m_gui_settings->GetValue(gui::m_richPresence).toBool()) if (m_gui_settings->GetValue(gui::m_richPresence).toBool())

8
rpcs3/rpcs3qt/main_window.cpp
View file

@ -1,6 +1,6 @@
#include <QMessageBox> #include "stdafx.h"
#include <QFileDialog>
#include "main_window.h"
#include "qt_utils.h" #include "qt_utils.h"
#include "vfs_dialog.h" #include "vfs_dialog.h"
#include "save_manager_dialog.h" #include "save_manager_dialog.h"
@ -16,7 +16,6 @@
#include "memory_string_searcher.h" #include "memory_string_searcher.h"
#include "memory_viewer_panel.h" #include "memory_viewer_panel.h"
#include "rsx_debugger.h" #include "rsx_debugger.h"
#include "main_window.h"
#include "about_dialog.h" #include "about_dialog.h"
#include "pad_settings_dialog.h" #include "pad_settings_dialog.h"
#include "progress_dialog.h" #include "progress_dialog.h"
@ -31,8 +30,9 @@
#include <QScreen> #include <QScreen>
#include <QDirIterator> #include <QDirIterator>
#include <QMimeData> #include <QMimeData>
#include <QMessageBox>
#include <QFileDialog>
#include "stdafx.h"
#include "rpcs3_version.h" #include "rpcs3_version.h"
#include "Emu/System.h" #include "Emu/System.h"
#include "Emu/system_config.h" #include "Emu/system_config.h"