From 2521a8820712a0e0b9915f650203438d0accdc1e Mon Sep 17 00:00:00 2001
From: Kingcom <sorgts@googlemail.com>
Date: Tue, 2 Jul 2013 17:43:34 +0200
Subject: [PATCH] Use ChangeBreakPointAddCond function

---
 Core/Debugger/Breakpoints.cpp         | 25 -------------------------
 Core/Debugger/Breakpoints.h           |  1 -
 Windows/Debugger/BreakpointWindow.cpp |  6 +++---
 3 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/Core/Debugger/Breakpoints.cpp b/Core/Debugger/Breakpoints.cpp
index ebdcecffb7..557a41d4b3 100644
--- a/Core/Debugger/Breakpoints.cpp
+++ b/Core/Debugger/Breakpoints.cpp
@@ -105,31 +105,6 @@ void CBreakPoints::AddBreakPoint(u32 addr, bool temp)
 	}
 }
 
-void CBreakPoints::AddBreakPoint(u32 addr, BreakPointCond cond)
-{
-	size_t bp = FindBreakpoint(addr);
-	if (bp == INVALID_BREAKPOINT)
-	{
-		BreakPoint pt;
-		pt.enabled = true;
-		pt.temporary = false;
-		pt.addr = addr;
-		pt.hasCond = true;
-		pt.cond = cond;
-
-		breakPoints_.push_back(pt);
-		Update(addr);
-	}
-	else if (!breakPoints_[bp].enabled)
-	{
-		breakPoints_[bp].enabled = true;
-		breakPoints_[bp].temporary = false;
-		breakPoints_[bp].hasCond = true;
-		breakPoints_[bp].cond = cond;
-		Update(addr);
-	}
-}
-
 void CBreakPoints::RemoveBreakPoint(u32 addr)
 {
 	size_t bp = FindBreakpoint(addr);
diff --git a/Core/Debugger/Breakpoints.h b/Core/Debugger/Breakpoints.h
index 2d5f2a13b5..3d6801bd30 100644
--- a/Core/Debugger/Breakpoints.h
+++ b/Core/Debugger/Breakpoints.h
@@ -102,7 +102,6 @@ public:
 	static bool IsAddressBreakPoint(u32 addr);
 	static bool IsTempBreakPoint(u32 addr);
 	static void AddBreakPoint(u32 addr, bool temp = false);
-	static void AddBreakPoint(u32 addr, BreakPointCond cond);	// conditional breakpoints aren't temporary
 	static void RemoveBreakPoint(u32 addr);
 	static void ChangeBreakPoint(u32 addr, bool enable);
 	static void ClearAllBreakPoints();
diff --git a/Windows/Debugger/BreakpointWindow.cpp b/Windows/Debugger/BreakpointWindow.cpp
index 778b05f87a..302f314e3d 100644
--- a/Windows/Debugger/BreakpointWindow.cpp
+++ b/Windows/Debugger/BreakpointWindow.cpp
@@ -196,15 +196,15 @@ void BreakpointWindow::addBreakpoint()
 		CBreakPoints::AddMemCheck(address,address+size,cond,result);
 	} else {
 		// add breakpoint
+		CBreakPoints::AddBreakPoint(address,false);
+
 		if (condition[0] != 0)
 		{
 			BreakPointCond cond;
 			cond.debug = cpu;
 			strcpy(cond.expressionString,condition);
 			cond.expression = compiledCondition;
-			CBreakPoints::AddBreakPoint(address,cond);
-		} else {
-			CBreakPoints::AddBreakPoint(address,false);
+			CBreakPoints::ChangeBreakPointAddCond(address,cond);
 		}
 
 		if (enabled == false)