Fixed a crash that would occur if a new watch were added by entering a watch name.

Code style updates.

Source/Core/Common/BreakPoints.cpp

@@ -280,7 +280,7 @@ void Watches::Update(int count, u32 em_address)
 	m_Watches.at(count).iAddress = em_address;
 }
 
-void Watches::UpdateName(int count, std::string name)
+void Watches::UpdateName(int count, const std::string name)
 {
 	m_Watches.at(count).name = name;
 }

Source/Core/Common/BreakPoints.h

@@ -125,7 +125,7 @@ public:
 	void Add(const TWatch& bp);
 
 	void Update(int count, u32 em_address);
-	void UpdateName(int count, std::string name);
+	void UpdateName(int count, const std::string name);
 
 	// Remove Breakpoint
 	void Remove(u32 _iAddress);

Source/Core/DolphinWX/Debugger/CodeWindow.cpp

@@ -342,7 +342,7 @@ void CCodeWindow::StepOut()
 		PowerPC::CoreMode oldMode = PowerPC::GetMode();
 		PowerPC::SetMode(PowerPC::MODE_INTERPRETER);
 		UGeckoInstruction inst = Memory::Read_Instruction(PC);
-		GekkoOPInfo *opinfo = GetOpInfo(inst);
+		GekkoOPInfo* opinfo = GetOpInfo(inst);
 		while (inst.hex != 0x4e800020 && steps < timeout) // check for blr
 		{
 			if (inst.LK)

Source/Core/DolphinWX/Debugger/WatchView.cpp

@@ -58,9 +58,17 @@ static void UpdateWatchAddr(int count, u32 value)
 	PowerPC::watches.Update(count - 1, value);
 }
 
-static void SetWatchName(int count, std::string value)
+static void SetWatchName(int count, const std::string value)
 {
+	if ((count - 1) < PowerPC::watches.GetWatches().size())
+	{
 		PowerPC::watches.UpdateName(count - 1, value);
+	}
+	else
+	{
+		PowerPC::watches.Add(0);
+		PowerPC::watches.UpdateName(PowerPC::watches.GetWatches().size() - 1, value);
+	}
 }
 
 static void SetWatchValue(int count, u32 value)
@@ -161,9 +169,9 @@ void CWatchTable::UpdateWatch()
 	}
 }
 
-wxGridCellAttr *CWatchTable::GetAttr(int row, int col, wxGridCellAttr::wxAttrKind)
+wxGridCellAttr* CWatchTable::GetAttr(int row, int col, wxGridCellAttr::wxAttrKind)
 {
-	wxGridCellAttr *attr = new wxGridCellAttr();
+	wxGridCellAttr* attr = new wxGridCellAttr();
 
 	attr->SetBackgroundColour(*wxWHITE);
 	attr->SetFont(DebuggerFont);
@@ -191,10 +199,8 @@ wxGridCellAttr *CWatchTable::GetAttr(int row, int col, wxGridCellAttr::wxAttrKin
 	else
 	{
 		bool red = false;
-		switch (col)
+		if (col == 1)
-		{
+			red = m_CachedWatchHasChanged[row];
-		case 1: red = m_CachedWatchHasChanged[row]; break;
-		}
 
 		attr->SetTextColour(red ? *wxRED : *wxBLACK);
 
@@ -208,7 +214,7 @@ wxGridCellAttr *CWatchTable::GetAttr(int row, int col, wxGridCellAttr::wxAttrKin
 	return attr;
 }
 
-CWatchView::CWatchView(wxWindow *parent, wxWindowID id)
+CWatchView::CWatchView(wxWindow* parent, wxWindowID id)
 	: wxGrid(parent, id)
 {
 	SetTable(new CWatchTable(), false);
@@ -269,11 +275,13 @@ void CWatchView::OnPopupMenu(wxCommandEvent& event)
 	{
 	case IDM_DELETEWATCH:
 		strNewVal = GetValueByRowCol(m_selectedRow, 1);
-		TryParse("0x" + WxStrToStr(strNewVal), &m_selectedAddress);
+		if (TryParse("0x" + WxStrToStr(strNewVal), &m_selectedAddress))
+		{
 			PowerPC::watches.Remove(m_selectedAddress);
 			if (watch_window)
 				watch_window->NotifyUpdate();
 			Refresh();
+		}
 		break;
 	case IDM_ADDMEMCHECK:
 		MemCheck.StartAddress = m_selectedAddress;

Source/Core/DolphinWX/Debugger/WatchView.h

@@ -30,8 +30,8 @@ public:
 	int GetNumberCols() override { return 5; }
 	int GetNumberRows() override { return MAX_SPECIALS; }
 	wxString GetValue(int row, int col) override;
-	void SetValue(int row, int col, const wxString &) override;
+	void SetValue(int row, int col, const wxString&) override;
-	wxGridCellAttr *GetAttr(int, int, wxGridCellAttr::wxAttrKind) override;
+	wxGridCellAttr* GetAttr(int, int, wxGridCellAttr::wxAttrKind) override;
 	void UpdateWatch();
 
 private:

Source/Core/DolphinWX/FrameTools.cpp

@@ -661,9 +661,7 @@ void CFrame::BootGame(const std::string& filename)
 	if (!bootfile.empty())
 	{
 		StartGame(bootfile);
-		if (UseDebugger)
+		if (UseDebugger && g_pCodeWindow)
-		{
-			if (g_pCodeWindow)
 		{
 			if (g_pCodeWindow->m_WatchWindow)
 				g_pCodeWindow->m_WatchWindow->LoadAll();
@@ -671,7 +669,6 @@ void CFrame::BootGame(const std::string& filename)
 				g_pCodeWindow->m_BreakpointWindow->LoadAll();
 		}
 	}
-	}
 }
 
 // Open file to boot
@@ -1178,9 +1175,7 @@ void CFrame::DoStop()
 			}
 		}
 
-		if (UseDebugger)
+		if (UseDebugger && g_pCodeWindow)
-		{
-			if (g_pCodeWindow)
 		{
 			if (g_pCodeWindow->m_WatchWindow)
 			{
@@ -1197,7 +1192,6 @@ void CFrame::DoStop()
 			g_symbolDB.Clear();
 			Host_NotifyMapLoaded();
 		}
-		}
 
 		// TODO: Show the author/description dialog here
 		if (Movie::IsRecordingInput())