From 9d52ee4e21c96eed00ca5289dd2fde3e8437574c Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Tue, 17 Mar 2015 23:06:25 -0700 Subject: [PATCH] Fix cases where breakpoints were skipped. After reset or savestate load. --- Core/MIPS/x86/Jit.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Core/MIPS/x86/Jit.cpp b/Core/MIPS/x86/Jit.cpp index 946d9592f7..9474216ecf 100644 --- a/Core/MIPS/x86/Jit.cpp +++ b/Core/MIPS/x86/Jit.cpp @@ -140,6 +140,10 @@ Jit::Jit(MIPSState *mips) : blocks(mips, this), mips_(mips) safeMemFuncs.Init(&thunks); js.startDefaultPrefix = mips_->HasDefaultPrefix(); + + // The debugger sets this so that "go" on a breakpoint will actually... go. + // But if they reset, we can end up hitting it by mistake, since it's based on PC and ticks. + CBreakPoints::SetSkipFirst(0); } Jit::~Jit() { @@ -158,6 +162,10 @@ void Jit::DoState(PointerWrap &p) } else { js.hasSetRounding = 1; } + + // The debugger sets this so that "go" on a breakpoint will actually... go. + // But if they load a state, we can end up hitting it by mistake, since it's based on PC and ticks. + CBreakPoints::SetSkipFirst(0); } // This is here so the savestate matches between jit and non-jit.