Breakpoints and watches are now loaded and saved on start/stop.

Saved Breakpoints and watches per game in the game ini.

1 files changed, 33 insertions, 0 deletions

diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp
index eb9c6632a7..2ef29ccecc 100644
--- a/Source/Core/DolphinWX/FrameTools.cpp
+++ b/Source/Core/DolphinWX/FrameTools.cpp
@@ -78,7 +78,9 @@
 #include "DolphinWX/WXInputBase.h"
 #include "DolphinWX/WxUtils.h"
 #include "DolphinWX/Cheats/CheatsWindow.h"
+#include "DolphinWX/Debugger/BreakpointWindow.h"
 #include "DolphinWX/Debugger/CodeWindow.h"
+#include "DolphinWX/Debugger/WatchWindow.h"
 
 #include "InputCommon/ControllerInterface/ControllerInterface.h"
 
@@ -656,7 +658,19 @@ void CFrame::BootGame(const std::string& filename)
 		}
 	}
 	if (!bootfile.empty())
+	{
 		StartGame(bootfile);
+		if (UseDebugger)
+		{
+			if (g_pCodeWindow)
+			{
+				if (g_pCodeWindow->m_WatchWindow)
+					g_pCodeWindow->m_WatchWindow->LoadAll();
+				if (g_pCodeWindow->m_BreakpointWindow)
+					g_pCodeWindow->m_BreakpointWindow->LoadAll();
+			}
+		}
+	}
 }
 
 // Open file to boot
@@ -1163,6 +1177,25 @@ void CFrame::DoStop()
 			}
 		}
 
+		if (UseDebugger)
+		{
+			if (g_pCodeWindow)
+			{
+				if (g_pCodeWindow->m_WatchWindow)
+				{
+					g_pCodeWindow->m_WatchWindow->SaveAll();
+					PowerPC::watches.Clear();
+				}
+				if (g_pCodeWindow->m_BreakpointWindow)
+				{
+					g_pCodeWindow->m_BreakpointWindow->SaveAll();
+					PowerPC::breakpoints.Clear();
+					PowerPC::memchecks.Clear();
+					g_pCodeWindow->m_BreakpointWindow->NotifyUpdate();
+				}
+			}
+		}
+
 		// TODO: Show the author/description dialog here
 		if (Movie::IsRecordingInput())
 			DoRecordingSave();