From df0fb9551fc0fee673e3b73afb534290f7bc9834 Mon Sep 17 00:00:00 2001
From: Kingcom <sorgts@googlemail.com>
Date: Fri, 15 Aug 2014 21:25:30 +0200
Subject: [PATCH] Always enable debugger

---
 pcsx2/CDVD/CDVDaccess.cpp      |  2 +-
 pcsx2/Config.h                 |  1 -
 pcsx2/Pcsx2Config.cpp          |  2 --
 pcsx2/System/SysCoreThread.cpp |  9 +++------
 pcsx2/gui/AppInit.cpp          | 20 +++++---------------
 pcsx2/gui/MainFrame.cpp        | 19 +++++--------------
 6 files changed, 14 insertions(+), 39 deletions(-)

diff --git a/pcsx2/CDVD/CDVDaccess.cpp b/pcsx2/CDVD/CDVDaccess.cpp
index ac3482ba6d..f588fa72bd 100644
--- a/pcsx2/CDVD/CDVDaccess.cpp
+++ b/pcsx2/CDVD/CDVDaccess.cpp
@@ -292,7 +292,7 @@ void CDVDsys_SetFile( CDVD_SourceType srctype, const wxString& newfile )
 	m_SourceFilename[srctype] = newfile;
 
 	// look for symbol file
-	if (g_Conf->EmuOptions.Debugger.EnableDebugger && symbolMap.IsEmpty())
+	if (symbolMap.IsEmpty())
 	{
 		wxString symName;
 		int n = newfile.Last('.');
diff --git a/pcsx2/Config.h b/pcsx2/Config.h
index 4e662db88f..6c01fbb266 100644
--- a/pcsx2/Config.h
+++ b/pcsx2/Config.h
@@ -408,7 +408,6 @@ struct Pcsx2Config
 	{
 		BITFIELD32()
 			bool
-				EnableDebugger		:1,
 				ShowDebuggerOnStart	:1;
 		BITFIELD_END
 
diff --git a/pcsx2/Pcsx2Config.cpp b/pcsx2/Pcsx2Config.cpp
index 283255a2c6..3d8b20a246 100644
--- a/pcsx2/Pcsx2Config.cpp
+++ b/pcsx2/Pcsx2Config.cpp
@@ -376,7 +376,6 @@ void Pcsx2Config::GamefixOptions::LoadSave( IniInterface& ini )
 
 Pcsx2Config::DebugOptions::DebugOptions()
 {
-	EnableDebugger = false;
 	ShowDebuggerOnStart = false;
 	FontWidth = 8;
 	FontHeight = 12;
@@ -386,7 +385,6 @@ void Pcsx2Config::DebugOptions::LoadSave( IniInterface& ini )
 {
 	ScopedIniGroup path( ini, L"Debugger" );
 
-	IniBitBool( EnableDebugger );
 	IniBitBool( ShowDebuggerOnStart );
 	IniBitfield(FontWidth);
 	IniBitfield(FontHeight);
diff --git a/pcsx2/System/SysCoreThread.cpp b/pcsx2/System/SysCoreThread.cpp
index 0f8d405df5..a932d7ec8a 100644
--- a/pcsx2/System/SysCoreThread.cpp
+++ b/pcsx2/System/SysCoreThread.cpp
@@ -230,12 +230,9 @@ void SysCoreThread::GameStartingInThread()
 {
 	GetMTGS().SendGameCRC(ElfCRC);
 
-	if (EmuConfig.Debugger.EnableDebugger)
-	{
-		MIPSAnalyst::ScanForFunctions(ElfTextRange.first,ElfTextRange.first+ElfTextRange.second,true);
-		symbolMap.UpdateActiveSymbols();
-		sApp.PostAppMethod(&Pcsx2App::resetDebugger);
-	}
+	MIPSAnalyst::ScanForFunctions(ElfTextRange.first,ElfTextRange.first+ElfTextRange.second,true);
+	symbolMap.UpdateActiveSymbols();
+	sApp.PostAppMethod(&Pcsx2App::resetDebugger);
 
 	if (EmuConfig.EnablePatches) ApplyPatch(0);
 	if (EmuConfig.EnableCheats)  ApplyCheat(0);
diff --git a/pcsx2/gui/AppInit.cpp b/pcsx2/gui/AppInit.cpp
index 7894c53f8f..cb42733844 100644
--- a/pcsx2/gui/AppInit.cpp
+++ b/pcsx2/gui/AppInit.cpp
@@ -66,22 +66,12 @@ void Pcsx2App::OpenMainFrame()
 
 	MainEmuFrame* mainFrame = new MainEmuFrame( NULL, pxGetAppName() );
 	m_id_MainFrame = mainFrame->GetId();
-	
-#ifndef PCSX2_DEVBUILD
-	if (g_Conf->EmuOptions.Debugger.EnableDebugger)
-#endif
-	{
-		DisassemblyDialog* disassembly = new DisassemblyDialog( mainFrame );
-		m_id_Disassembler = disassembly->GetId();
 
-		if (g_Conf->EmuOptions.Debugger.ShowDebuggerOnStart)
-			disassembly->Show();
-	}
-#ifndef PCSX2_DEVBUILD
-	else {
-		m_id_Disassembler = 0;
-	}
-#endif
+	DisassemblyDialog* disassembly = new DisassemblyDialog( mainFrame );
+	m_id_Disassembler = disassembly->GetId();
+
+	if (g_Conf->EmuOptions.Debugger.ShowDebuggerOnStart)
+		disassembly->Show();
 
 	PostIdleAppMethod( &Pcsx2App::OpenProgramLog );
 
diff --git a/pcsx2/gui/MainFrame.cpp b/pcsx2/gui/MainFrame.cpp
index db0a907c34..ea6e88a893 100644
--- a/pcsx2/gui/MainFrame.cpp
+++ b/pcsx2/gui/MainFrame.cpp
@@ -339,13 +339,7 @@ MainEmuFrame::MainEmuFrame(wxWindow* parent, const wxString& title)
 	m_menubar.Append( &m_menuCDVD,		_("CD&VD") );
 	m_menubar.Append( &m_menuConfig,	_("&Config") );
 	m_menubar.Append( &m_menuMisc,		_("&Misc") );
-	
-#ifndef PCSX2_DEVBUILD
-	if (g_Conf->EmuOptions.Debugger.EnableDebugger)
-#endif
-	{
-		m_menubar.Append( &m_menuDebug,		_("&Debug") );
-	}
+	m_menubar.Append( &m_menuDebug,		_("&Debug") );
 
 	SetMenuBar( &m_menubar );
 
@@ -512,14 +506,11 @@ MainEmuFrame::MainEmuFrame(wxWindow* parent, const wxString& title)
 	m_menuMisc.AppendSeparator();
 	m_menuMisc.Append( MenuId_ChangeLang,		L"Change Language" ); // Always in English
 
-#ifndef PCSX2_DEVBUILD
-	if (g_Conf->EmuOptions.Debugger.EnableDebugger)
+	m_menuDebug.Append(MenuId_Debug_Open,		_("Open Debug Window..."),	wxEmptyString);
+
+#ifdef PCSX2_DEVBUILD
+	m_menuDebug.Append(MenuId_Debug_Logging,	_("Logging..."),			wxEmptyString);
 #endif
-	{
-		m_menuDebug.Append(MenuId_Debug_Open,		_("Open Debug Window..."),	wxEmptyString);
-		//m_menuDebug.Append(MenuId_Debug_MemoryDump,	_("Memory Dump..."),		wxEmptyString);
-		m_menuDebug.Append(MenuId_Debug_Logging,	_("Logging..."),			wxEmptyString);
-	}
 
 	m_MenuItem_Console.Check( g_Conf->ProgLogBox.Visible );