From b81617fba1d618d3f0c9b645fc057645616caa1f Mon Sep 17 00:00:00 2001
From: archshift <admin@archshift.com>
Date: Sat, 9 Aug 2014 00:56:20 -0700
Subject: [PATCH] Removed TBDebug, using TBMain instead. Fixed debugger assert.

---
 Source/Core/DolphinWX/Debugger/CodeWindow.cpp |  2 +-
 Source/Core/DolphinWX/Frame.cpp               |  3 +--
 Source/Core/DolphinWX/Frame.h                 |  2 +-
 Source/Core/DolphinWX/FrameTools.cpp          | 17 ++++++++++-------
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp
index 0fde18f6ff..315bd3c962 100644
--- a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp
+++ b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp
@@ -131,7 +131,7 @@ wxMenuBar *CCodeWindow::GetMenuBar()
 
 wxToolBar *CCodeWindow::GetToolBar()
 {
-	return Parent->m_ToolBarDebug;
+	return Parent->m_ToolBar;
 }
 
 // ----------
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp
index 5786108a61..258bda6b12 100644
--- a/Source/Core/DolphinWX/Frame.cpp
+++ b/Source/Core/DolphinWX/Frame.cpp
@@ -307,8 +307,7 @@ CFrame::CFrame(wxFrame* parent,
 		long style)
 	: CRenderFrame(parent, id, title, pos, size, style)
 	, g_pCodeWindow(nullptr), g_NetPlaySetupDiag(nullptr), g_CheatsWindow(nullptr)
-	, m_ToolBar(nullptr), m_ToolBarDebug(nullptr)
-	, m_SavedPerspectives(nullptr)
+	, m_ToolBar(nullptr), m_SavedPerspectives(nullptr)
 	, m_GameListCtrl(nullptr), m_Panel(nullptr)
 	, m_RenderFrame(nullptr), m_RenderParent(nullptr)
 	, m_LogWindow(nullptr), m_LogConfigWindow(nullptr)
diff --git a/Source/Core/DolphinWX/Frame.h b/Source/Core/DolphinWX/Frame.h
index cab81080e7..f8c5cfbb42 100644
--- a/Source/Core/DolphinWX/Frame.h
+++ b/Source/Core/DolphinWX/Frame.h
@@ -139,7 +139,7 @@ public:
 
 	wxMenu* m_SavedPerspectives;
 
-	wxToolBar *m_ToolBar, *m_ToolBarDebug;
+	wxToolBar *m_ToolBar;
 	// AUI
 	wxAuiManager *m_Mgr;
 	bool bFloatWindow[IDM_CODEWINDOW - IDM_LOGWINDOW + 1];
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp
index 59ed822bd8..d1303d3ee3 100644
--- a/Source/Core/DolphinWX/FrameTools.cpp
+++ b/Source/Core/DolphinWX/FrameTools.cpp
@@ -540,15 +540,18 @@ void CFrame::RecreateToolbar()
 
 	long TOOLBAR_STYLE = wxTB_DEFAULT_STYLE | wxTB_TEXT;
 
-	if (g_pCodeWindow && !m_ToolBarDebug)
+	if (!m_ToolBar)
 	{
-		m_ToolBarDebug = CreateToolBar(TOOLBAR_STYLE, wxID_ANY, "TBDebug");
-		g_pCodeWindow->PopulateToolbar(m_ToolBarDebug);
-		m_ToolBarDebug->AddSeparator();
-	}
+		m_ToolBar = CreateToolBar(TOOLBAR_STYLE, wxID_ANY, "TBMain");
 
-	m_ToolBar = CreateToolBar(TOOLBAR_STYLE, wxID_ANY, "TBMain");
-	PopulateToolbar(m_ToolBar);
+		if (g_pCodeWindow)
+		{
+			g_pCodeWindow->PopulateToolbar(m_ToolBar);
+			m_ToolBar->AddSeparator();
+		}
+
+		PopulateToolbar(m_ToolBar);
+	}
 
 	UpdateGUI();
 }