ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Shawn Hoffman 2009-03-27 23:07:28 +00:00
parent 8628be39c7
commit bdabcd4bf5
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/Common/Common.vcproj
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="9,00" Version="9.00"
Name="Common" Name="Common"
ProjectGUID="{C573CAF7-EE6A-458E-8049-16C0BF34C2E9}" ProjectGUID="{C573CAF7-EE6A-458E-8049-16C0BF34C2E9}"
RootNamespace="Common" RootNamespace="Common"
@ -539,6 +539,10 @@
RelativePath=".\Src\ConsoleListener.cpp" RelativePath=".\Src\ConsoleListener.cpp"
> >
</File> </File>
<File
RelativePath=".\Src\Log.h"
>
</File>
<File <File
RelativePath=".\Src\LogManager.cpp" RelativePath=".\Src\LogManager.cpp"
> >
@ -664,10 +668,6 @@
RelativePath=".\Src\IniFile.h" RelativePath=".\Src\IniFile.h"
> >
</File> </File>
<File
RelativePath=".\Src\Log.h"
>
</File>
<File <File
RelativePath=".\Src\MappedFile.cpp" RelativePath=".\Src\MappedFile.cpp"
> >

2
Source/Core/Core/Src/Core.cpp
View File

@ -283,7 +283,7 @@ void Stop()
// Close the trace file // Close the trace file
Core::StopTrace(); Core::StopTrace();
NOTICE_LOG(BOOT, "Shutting core"); NOTICE_LOG(BOOT, "Shutting down core");
// Update mouse pointer // Update mouse pointer
Host_SetWaitCursor(false); Host_SetWaitCursor(false);

3
Source/Core/DolphinWX/Src/Frame.h
View File

@ -225,7 +225,8 @@ class CFrame : public wxFrame
// Menu items // Menu items
wxMenuBar* m_pMenuBar; wxMenuBar* m_pMenuBar;
wxMenuItem* m_pMenuItemOpen; // File wxMenuItem* m_pMenuItemOpen; // File
wxMenuItem* m_pMenuItemOpenDrive; // Drive
wxMenuItem* m_pMenuItemPlay; // Emulation wxMenuItem* m_pMenuItemPlay; // Emulation
wxMenuItem* m_pMenuItemStop; wxMenuItem* m_pMenuItemStop;

3
Source/Core/DolphinWX/Src/FrameTools.cpp
View File

@ -104,7 +104,7 @@ void CFrame::CreateMenu()
m_pMenuItemOpen = fileMenu->Append(wxID_OPEN, _T("&Open...\tCtrl+O")); m_pMenuItemOpen = fileMenu->Append(wxID_OPEN, _T("&Open...\tCtrl+O"));
wxMenu *externalDrive = new wxMenu; 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(); drives = cdio_get_devices();
for (int i = 0; drives[i] != NULL && i < 24; i++) { for (int i = 0; drives[i] != NULL && i < 24; i++) {
@ -827,6 +827,7 @@ void CFrame::UpdateGUI()
// File // File
m_pMenuItemOpen->Enable(!initialized); m_pMenuItemOpen->Enable(!initialized);
m_pMenuItemOpenDrive->Enable(!initialized);
// Emulation // Emulation
m_pMenuItemStop->Enable(running || paused); m_pMenuItemStop->Enable(running || paused);