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 @@ + + @@ -664,10 +668,6 @@ RelativePath=".\Src\IniFile.h" > - - 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);