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

DOL loader cleanup with std::vector and safety checks

Browse Source
This commit is contained in:
JosJuice
2015-05-09 16:49:18 +02:00
parent 268b8fd26f
commit 35c77abbc2
5 changed files with 87 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/Core/Boot/Boot.cpp
View File

@ -233,7 +233,7 @@ bool CBoot::BootUp()
DVDInterface::SetVolumeName(_StartupPara.m_strFilename);
DVDInterface::SetDiscInside(DVDInterface::VolumeIsValid());
if (!DVDInterface::VolumeIsValid())
break;
return false;
const DiscIO::IVolume& pVolume = DVDInterface::GetVolume();
@ -296,6 +296,9 @@ bool CBoot::BootUp()
case SCoreStartupParameter::BOOT_DOL:
{
CDolLoader dolLoader(_StartupPara.m_strFilename);
if (!dolLoader.IsValid())
return false;
// Check if we have gotten a Wii file or not
bool dolWii = dolLoader.IsWii();
if (dolWii != _StartupPara.bWii)