summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2017-04-08 18:51:26 +0200
committerJosJuice <josjuice@gmail.com>2017-04-08 18:52:39 +0200
commit9d73196e4f8a03451fde3320182ef0640ee4fc18 (patch)
tree685cba423a2f27473480464c02a9283c7114e2a1 /Source/Core
parent0b78386044690ec1ba3869f413d7774a9bd59a63 (diff)
Boot: Make default ISO code for DOLs consistent with ELFs
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/Core/Boot/Boot.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/Core/Core/Boot/Boot.cpp b/Source/Core/Core/Boot/Boot.cpp
index b669b44b2c..f2f77676de 100644
--- a/Source/Core/Core/Boot/Boot.cpp
+++ b/Source/Core/Core/Boot/Boot.cpp
@@ -334,15 +334,17 @@ bool CBoot::BootUp()
PanicAlertT("Warning - starting DOL in wrong console mode!");
}
- if (!_StartupPara.m_strDefaultISO.empty())
- DVDInterface::SetVolumeName(_StartupPara.m_strDefaultISO);
-
if (!_StartupPara.m_strDVDRoot.empty())
{
NOTICE_LOG(BOOT, "Setting DVDRoot %s", _StartupPara.m_strDVDRoot.c_str());
DVDInterface::SetVolumeDirectory(_StartupPara.m_strDVDRoot, dolWii,
_StartupPara.m_strApploader, _StartupPara.m_strFilename);
}
+ else if (!_StartupPara.m_strDefaultISO.empty())
+ {
+ NOTICE_LOG(BOOT, "Loading default ISO %s", _StartupPara.m_strDefaultISO.c_str());
+ DVDInterface::SetVolumeName(_StartupPara.m_strDefaultISO);
+ }
if (!EmulatedBS2(dolWii))
{