Core: Avoid (Some) Global System Accessor

This commit is contained in:
mitaclaw
2024-03-18 01:35:42 -07:00
parent 85dee300b5
commit f09b71582e
16 changed files with 54 additions and 51 deletions

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();