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

DVDInterface: Call SetDiscInside when setting volume

Browse Source 
SetDiscInside is an implementation detail that callers shouldn't
have to call on their own.
This commit is contained in:
JosJuice
2016-01-30 18:35:19 +01:00
parent 489d90b6f3
commit 0abf875a3f
3 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -267,7 +267,6 @@ bool CBoot::BootUp()
case SConfig::BOOT_ISO:
{
DVDInterface::SetVolumeName(_StartupPara.m_strFilename);
DVDInterface::SetDiscInside(DVDInterface::VolumeIsValid());
if (!DVDInterface::VolumeIsValid())
return false;
@ -353,8 +352,6 @@ bool CBoot::BootUp()
BS2Success = EmulatedBS2(dolWii);
}
DVDInterface::SetDiscInside(DVDInterface::VolumeIsValid());
if (!BS2Success)
{
// Set up MSR and the BAT SPR registers.
@ -414,8 +411,6 @@ bool CBoot::BootUp()
DVDInterface::SetVolumeDirectory(_StartupPara.m_strFilename, _StartupPara.bWii);
}
DVDInterface::SetDiscInside(DVDInterface::VolumeIsValid());
// Poor man's bootup
if (_StartupPara.bWii)
{
@ -450,13 +445,11 @@ bool CBoot::BootUp()
else if (!_StartupPara.m_strDefaultISO.empty())
DVDInterface::SetVolumeName(_StartupPara.m_strDefaultISO);
DVDInterface::SetDiscInside(DVDInterface::VolumeIsValid());
break;
// Bootstrap 2 (AKA: Initial Program Loader, "BIOS")
case SConfig::BOOT_BS2:
{
DVDInterface::SetDiscInside(DVDInterface::VolumeIsValid());
if (Load_BS2(_StartupPara.m_strBootROM))
{
if (LoadMapFromFilename())