piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 15:19:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12648 from mitaclaw/core-global-system

Browse Source 
Core: Avoid (Some) Global System Accessor
This commit is contained in:
Admiral H. Curtiss
2024-03-22 04:13:01 +01:00
committed by GitHub
parent 4f3b4471f2 f09b71582e
commit f8fdaf9b94
16 changed files with 54 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/DolphinQt/Main.cpp
View File

@ -28,6 +28,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"
@ -179,7 +180,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"))
@ -293,7 +294,7 @@ int main(int argc, char* argv[])
retval = app.exec();
}
Core::Shutdown();
Core::Shutdown(Core::System::GetInstance());
UICommon::Shutdown();
Host::GetInstance()->deleteLater();

4
Source/Core/DolphinQt/MainWindow.cpp
View File

@ -909,7 +909,7 @@ bool MainWindow::RequestStop()
{
if (!Core::IsRunning())
{
Core::QueueHostJob([this] { OnStopComplete(); }, true);
Core::QueueHostJob([this](Core::System&) { OnStopComplete(); }, true);
return true;
}
@ -1009,7 +1009,7 @@ bool MainWindow::RequestStop()
void MainWindow::ForceStop()
{
Core::Stop();
Core::Stop(Core::System::GetInstance());
}
void MainWindow::Reset()