Merge pull request #5228 from JosJuice/why-did-this-exist

Get rid of some nonsense related to booting DOL/ELF files
dolphin-emu · Apr 12, 2017 · 21544f8 · 21544f8
2 parents dd189f3 + 9d73196
commit 21544f8
Showing 1 changed file with 6 additions and 20 deletions.
diff --git a/Source/Core/Core/Boot/Boot.cpp b/Source/Core/Core/Boot/Boot.cpp
@@ -333,29 +333,19 @@ bool CBoot::BootUp()
       PanicAlertT("Warning - starting DOL in wrong console mode!");
     }
 
-    bool BS2Success = false;
-
-    if (dolWii)
-    {
-      BS2Success = EmulatedBS2(dolWii);
-    }
-    else if ((!DVDInterface::IsDiscInside() ||
-              DVDInterface::GetVolume().GetVolumeType() != DiscIO::Platform::WII_DISC) &&
-             !_StartupPara.m_strDefaultISO.empty())
-    {
-      DVDInterface::SetVolumeName(_StartupPara.m_strDefaultISO);
-      BS2Success = EmulatedBS2(dolWii);
-    }
-
     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);
-      BS2Success = EmulatedBS2(dolWii);
+    }
+    else if (!_StartupPara.m_strDefaultISO.empty())
+    {
+      NOTICE_LOG(BOOT, "Loading default ISO %s", _StartupPara.m_strDefaultISO.c_str());
+      DVDInterface::SetVolumeName(_StartupPara.m_strDefaultISO);
     }
 
-    if (!BS2Success)
+    if (!EmulatedBS2(dolWii))
     {
       // Set up MSR and the BAT SPR registers.
       UReg_MSR& m_MSR = ((UReg_MSR&)PowerPC::ppcState.msr);
@@ -409,10 +399,6 @@ bool CBoot::BootUp()
       NOTICE_LOG(BOOT, "Loading default ISO %s", _StartupPara.m_strDefaultISO.c_str());
       DVDInterface::SetVolumeName(_StartupPara.m_strDefaultISO);
     }
-    else
-    {
-      DVDInterface::SetVolumeDirectory(_StartupPara.m_strFilename, _StartupPara.bWii);
-    }
 
     // Poor man's bootup
     if (_StartupPara.bWii)