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

Merge pull request #2188 from JosJuice/dol-cleanup

Browse Source 
DOL loader cleanup with std::vector and safety checks
This commit is contained in:
Ryan Houdek
2015-05-25 23:51:40 -04:00
parent f4625e6383 35c77abbc2
commit a4a8162fb5
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

@ -234,7 +234,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();
@ -297,6 +297,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)