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

Merge pull request #12608 from mitaclaw/bootmanager-global-system

Browse Source 
BootManager: Avoid Global System Accessor
This commit is contained in:
Admiral H. Curtiss
2024-03-12 03:39:48 +01:00
committed by GitHub
parent 72bcdadc16 16c609dcd4
commit d35a88564f
5 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/BootManager.cpp
View File

@ -55,12 +55,12 @@
namespace BootManager
{
// Boot the ISO or file
bool BootCore(std::unique_ptr<BootParameters> boot, const WindowSystemInfo& wsi)
bool BootCore(Core::System& system, std::unique_ptr<BootParameters> boot,
const WindowSystemInfo& wsi)
{
if (!boot)
return false;
auto& system = Core::System::GetInstance();
SConfig& StartUp = SConfig::GetInstance();
if (!StartUp.SetPathsAndGameMetadata(system, *boot))

7
Source/Core/Core/BootManager.h
View File

@ -5,12 +5,17 @@
#include <memory>
namespace Core
{
class System;
}
struct BootParameters;
struct WindowSystemInfo;
namespace BootManager
{
bool BootCore(std::unique_ptr<BootParameters> parameters, const WindowSystemInfo& wsi);
bool BootCore(Core::System& system, std::unique_ptr<BootParameters> parameters,
const WindowSystemInfo& wsi);
// Synchronise Dolphin's configuration with the SYSCONF (which may have changed during emulation),
// and restore settings that were overriden by per-game INIs or for some other reason.