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

Always enable debugger in devbuilds, but keep function scanning restricted to the enable state

This commit is contained in:
Kingcom 2014-02-24 16:22:36 +01:00
parent e55229db40
commit b69dcb51a0
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pcsx2/gui/AppInit.cpp
View File

@ -88,16 +88,21 @@ void Pcsx2App::OpenMainFrame()
MainEmuFrame* mainFrame = new MainEmuFrame( NULL, pxGetAppName() ); MainEmuFrame* mainFrame = new MainEmuFrame( NULL, pxGetAppName() );
m_id_MainFrame = mainFrame->GetId(); m_id_MainFrame = mainFrame->GetId();
#ifndef PCSX2_DEVBUILD
if (g_Conf->EmuOptions.Debugger.EnableDebugger) if (g_Conf->EmuOptions.Debugger.EnableDebugger)
#endif
{ {
DisassemblyDialog* disassembly = new DisassemblyDialog( mainFrame ); DisassemblyDialog* disassembly = new DisassemblyDialog( mainFrame );
m_id_Disassembler = disassembly->GetId(); m_id_Disassembler = disassembly->GetId();
if (g_Conf->EmuOptions.Debugger.ShowDebuggerOnStart) if (g_Conf->EmuOptions.Debugger.ShowDebuggerOnStart)
disassembly->Show(); disassembly->Show();
} else { }
#ifndef PCSX2_DEVBUILD
else {
m_id_Disassembler = 0; m_id_Disassembler = 0;
} }
#endif
PostIdleAppMethod( &Pcsx2App::OpenProgramLog ); PostIdleAppMethod( &Pcsx2App::OpenProgramLog );

6
pcsx2/gui/MainFrame.cpp
View File

@ -340,8 +340,12 @@ MainEmuFrame::MainEmuFrame(wxWindow* parent, const wxString& title)
m_menubar.Append( &m_menuConfig, _("&Config") ); m_menubar.Append( &m_menuConfig, _("&Config") );
m_menubar.Append( &m_menuMisc, _("&Misc") ); m_menubar.Append( &m_menuMisc, _("&Misc") );
#ifndef PCSX2_DEVBUILD
if (g_Conf->EmuOptions.Debugger.EnableDebugger) if (g_Conf->EmuOptions.Debugger.EnableDebugger)
#endif
{
m_menubar.Append( &m_menuDebug, _("&Debug") ); m_menubar.Append( &m_menuDebug, _("&Debug") );
}
SetMenuBar( &m_menubar ); SetMenuBar( &m_menubar );
@ -508,7 +512,9 @@ MainEmuFrame::MainEmuFrame(wxWindow* parent, const wxString& title)
m_menuMisc.AppendSeparator(); m_menuMisc.AppendSeparator();
m_menuMisc.Append( MenuId_ChangeLang, L"Change Language" ); // Always in English m_menuMisc.Append( MenuId_ChangeLang, L"Change Language" ); // Always in English
#ifndef PCSX2_DEVBUILD
if (g_Conf->EmuOptions.Debugger.EnableDebugger) if (g_Conf->EmuOptions.Debugger.EnableDebugger)
#endif
{ {
m_menuDebug.Append(MenuId_Debug_Open, _("Open Debug Window..."), wxEmptyString); m_menuDebug.Append(MenuId_Debug_Open, _("Open Debug Window..."), wxEmptyString);
//m_menuDebug.Append(MenuId_Debug_MemoryDump, _("Memory Dump..."), wxEmptyString); //m_menuDebug.Append(MenuId_Debug_MemoryDump, _("Memory Dump..."), wxEmptyString);