From 25df6acb15ce3854bc95433d0386015ab1ea4025 Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Fri, 17 Apr 2009 09:27:35 +0000
Subject: [PATCH] HLE bios before loading a .dol

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2987 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/Core/Src/Boot/Boot.cpp | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/Source/Core/Core/Src/Boot/Boot.cpp b/Source/Core/Core/Src/Boot/Boot.cpp
index 75e5ed90ac..352511923c 100644
--- a/Source/Core/Core/Src/Boot/Boot.cpp
+++ b/Source/Core/Core/Src/Boot/Boot.cpp
@@ -247,6 +247,29 @@ bool CBoot::BootUp()
     // ===================================================================================
     case SCoreStartupParameter::BOOT_DOL:
         {
+			// Check if we have gotten a Wii file or not
+			bool dolWii = CDolLoader::IsDolWii(_StartupPara.m_strFilename.c_str());
+			if (dolWii != _StartupPara.bWii)
+			{
+				PanicAlert("Warning - starting DOL in wrong console mode!");
+			}
+
+			// stop apploader from running when BIOS boots
+			VolumeHandler::SetVolumeName("");			
+
+			if (dolWii)
+			{                              
+				EmulatedBIOS_Wii(false);
+			}
+			else
+			{
+				if (!VolumeHandler::IsWii() && !_StartupPara.m_strDefaultGCM.empty())
+				{
+					VolumeHandler::SetVolumeName(_StartupPara.m_strDefaultGCM.c_str());
+					EmulatedBIOS(false);
+				}
+			}
+
             CDolLoader dolLoader(_StartupPara.m_strFilename.c_str());
             PC = dolLoader.GetEntryPoint();
 #ifdef _DEBUG