mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-09-02 07:36:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Convert Dolphin.Core.DefaultISO to use new-style config

Browse source
This commit is contained in:
Michael M 2018-07-06 18:29:46 -07:00
commit e7cbee235c
6 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Source/Core/Core/Boot/Boot.cpp
View file

@ -31,6 +31,7 @@
#include "Core/Boot/DolReader.h"
#include "Core/Boot/ElfReader.h"
#include "Core/CommonTitles.h"
#include "Core/Config/MainSettings.h"
#include "Core/Config/SYSCONFSettings.h"
#include "Core/ConfigManager.h"
#include "Core/FifoPlayer/FifoPlayer.h"
@ -291,9 +292,9 @@ bool CBoot::Load_BS2(const std::string& boot_rom_filename)
static void SetDefaultDisc()
{
const SConfig& config = SConfig::GetInstance();
if (!config.m_strDefaultISO.empty())
SetDisc(DiscIO::CreateVolumeFromFilename(config.m_strDefaultISO));
const std::string default_iso = Config::Get(Config::MAIN_DEFAULT_ISO);
if (!default_iso.empty())
SetDisc(DiscIO::CreateVolumeFromFilename(default_iso));
}
static void CopyDefaultExceptionHandlers()