From bdabcd4bf5a460eaed21571b17ecd48b8f8c01aa Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Fri, 27 Mar 2009 23:07:28 +0000
Subject: [PATCH] disable boot from drive when emulator is running (issue 781)

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2767 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/Common/Common.vcproj         | 10 +++++-----
 Source/Core/Core/Src/Core.cpp            |  2 +-
 Source/Core/DolphinWX/Src/Frame.h        |  3 ++-
 Source/Core/DolphinWX/Src/FrameTools.cpp |  3 ++-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Source/Core/Common/Common.vcproj b/Source/Core/Common/Common.vcproj
index e112791a24..c86cb67f28 100644
--- a/Source/Core/Common/Common.vcproj
+++ b/Source/Core/Common/Common.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="Common"
 	ProjectGUID="{C573CAF7-EE6A-458E-8049-16C0BF34C2E9}"
 	RootNamespace="Common"
@@ -539,6 +539,10 @@
 				RelativePath=".\Src\ConsoleListener.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\Src\Log.h"
+				>
+			</File>
 			<File
 				RelativePath=".\Src\LogManager.cpp"
 				>
@@ -664,10 +668,6 @@
 			RelativePath=".\Src\IniFile.h"
 			>
 		</File>
-		<File
-			RelativePath=".\Src\Log.h"
-			>
-		</File>
 		<File
 			RelativePath=".\Src\MappedFile.cpp"
 			>
diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp
index 5ca17d1b5e..f9de96303d 100644
--- a/Source/Core/Core/Src/Core.cpp
+++ b/Source/Core/Core/Src/Core.cpp
@@ -283,7 +283,7 @@ void Stop()
 
 	// Close the trace file
 	Core::StopTrace();
-	NOTICE_LOG(BOOT, "Shutting core");
+	NOTICE_LOG(BOOT, "Shutting down core");
 
 	// Update mouse pointer
 	Host_SetWaitCursor(false);
diff --git a/Source/Core/DolphinWX/Src/Frame.h b/Source/Core/DolphinWX/Src/Frame.h
index 9a98d2292c..522aa315a3 100644
--- a/Source/Core/DolphinWX/Src/Frame.h
+++ b/Source/Core/DolphinWX/Src/Frame.h
@@ -225,7 +225,8 @@ class CFrame : public wxFrame
 		// Menu items
 		wxMenuBar* m_pMenuBar;
 
-		wxMenuItem* m_pMenuItemOpen; // File
+		wxMenuItem* m_pMenuItemOpen;		// File
+		wxMenuItem* m_pMenuItemOpenDrive;	// Drive
 
 		wxMenuItem* m_pMenuItemPlay; // Emulation
 		wxMenuItem* m_pMenuItemStop;
diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp
index 5affc7fbd8..7c6b5c2996 100644
--- a/Source/Core/DolphinWX/Src/FrameTools.cpp
+++ b/Source/Core/DolphinWX/Src/FrameTools.cpp
@@ -104,7 +104,7 @@ void CFrame::CreateMenu()
 	m_pMenuItemOpen = fileMenu->Append(wxID_OPEN, _T("&Open...\tCtrl+O"));
 
 	wxMenu *externalDrive = new wxMenu;
-	fileMenu->AppendSubMenu(externalDrive, _T("&Boot from DVD Drive..."));
+	m_pMenuItemOpenDrive = fileMenu->AppendSubMenu(externalDrive, _T("&Boot from DVD Drive..."));
 	
 	drives = cdio_get_devices();
 	for (int i = 0; drives[i] != NULL && i < 24; i++) {
@@ -827,6 +827,7 @@ void CFrame::UpdateGUI()
 
 	// File
 	m_pMenuItemOpen->Enable(!initialized);
+	m_pMenuItemOpenDrive->Enable(!initialized);
 
 	// Emulation
 	m_pMenuItemStop->Enable(running || paused);