mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-05-17 16:42:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/dolphin-emu/dolphin into dolphin-emu-master

Browse source
This commit is contained in:
Nayla Hanegan 2024-05-11 22:21:49 -04:00
commit 0a2d2c624b
511 changed files with 74722 additions and 58925 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Source/Core/DolphinQt/Main.cpp
View file

@ -30,6 +30,7 @@
#include "Core/Config/MainSettings.h"
#include "Core/Core.h"
#include "Core/DolphinAnalytics.h"
#include "Core/System.h"
#include "DolphinQt/Host.h"
#include "DolphinQt/MainWindow.h"
@ -54,7 +55,7 @@ static bool QtMsgAlertHandler(const char* caption, const char* text, bool yes_no
std::optional<bool> r = RunOnObject(QApplication::instance(), [&] {
// If we were called from the CPU/GPU thread, set us as the CPU/GPU thread.
// This information is used in order to avoid deadlocks when calling e.g.
// Host::SetRenderFocus or Core::RunAsCPUThread. (Host::SetRenderFocus
// Host::SetRenderFocus or Core::CPUThreadGuard. (Host::SetRenderFocus
// can get called automatically when a dialog steals the focus.)
Common::ScopeGuard cpu_scope_guard(&Core::UndeclareAsCPUThread);
@ -187,7 +188,7 @@ int main(int argc, char* argv[])
// Whenever the event loop is about to go to sleep, dispatch the jobs
// queued in the Core first.
QObject::connect(QAbstractEventDispatcher::instance(), &QAbstractEventDispatcher::aboutToBlock,
&app, &Core::HostDispatchJobs);
&app, [] { Core::HostDispatchJobs(Core::System::GetInstance()); });
std::optional<std::string> save_state_path;
if (options.is_set("save_state"))
@ -303,7 +304,7 @@ int main(int argc, char* argv[])
retval = app.exec();
}
Core::Shutdown();
Core::Shutdown(Core::System::GetInstance());
UICommon::Shutdown();
Host::GetInstance()->deleteLater();