Added Load/Save function for the Watch window.

Made the floating windows toolbars dockable.
Scaled down the breakpoint toolbar icons to 16x16.

1 files changed, 2 insertions, 2 deletions

diff --git a/Source/Core/Common/BreakPoints.cpp b/Source/Core/Common/BreakPoints.cpp
index 8ef93758ab..e0498e34d0 100644
--- a/Source/Core/Common/BreakPoints.cpp
+++ b/Source/Core/Common/BreakPoints.cpp
@@ -234,7 +234,7 @@ Watches::TWatchesStr Watches::GetStrings() const
 	for (const TWatch& bp : m_Watches)
 	{
 		std::stringstream ss;
-		ss << std::hex << bp.iAddress << " " << (bp.bOn ? "n" : "");
+		ss << std::hex << bp.iAddress << " " << bp.name;
 		bps.push_back(ss.str());
 	}
 
@@ -249,7 +249,7 @@ void Watches::AddFromStrings(const TWatchesStr& bpstrs)
 		std::stringstream ss;
 		ss << std::hex << bpstr;
 		ss >> bp.iAddress;
-		bp.bOn = bpstr.find("n") != bpstr.npos;
+		ss >> bp.name;
 		Add(bp);
 	}
 }