From 887a56ba806f64478bc63a8cc4327334f4f42201 Mon Sep 17 00:00:00 2001
From: Yuhei Okazaki <y.2.okazaki@gmail.com>
Date: Sat, 5 Dec 2015 23:21:19 +0900
Subject: fix bug that doesn't stop program when execute next command.

---
 mrbgems/mruby-bin-debugger/tools/mrdb/cmdrun.c | 1 +
 mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.c   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'mrbgems/mruby-bin-debugger')

diff --git a/mrbgems/mruby-bin-debugger/tools/mrdb/cmdrun.c b/mrbgems/mruby-bin-debugger/tools/mrdb/cmdrun.c
index 37d3f2101..2030c08b6 100755
--- a/mrbgems/mruby-bin-debugger/tools/mrdb/cmdrun.c
+++ b/mrbgems/mruby-bin-debugger/tools/mrdb/cmdrun.c
@@ -57,5 +57,6 @@ dbgcmd_state
 dbgcmd_next(mrb_state *mrb, mrdb_state *mrdb)
 {
   mrdb->dbg->xm = DBG_NEXT;
+  mrdb->dbg->prvci = mrb->c->ci;
   return DBGST_CONTINUE;
 }
diff --git a/mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.c b/mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.c
index 45e0b51d8..a5cf3be54 100755
--- a/mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.c
+++ b/mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.c
@@ -585,6 +585,7 @@ mrb_code_fetch_hook(mrb_state *mrb, mrb_irep *irep, mrb_code *pc, mrb_value *reg
     if((uint32_t)(dbg->prvci) < (uint32_t)(mrb->c->ci)) {
       return;
     }
+    dbg->prvci = NULL;
     dbg->method_bpno = 0;
     dbg->bm = BRK_NEXT;
     break;
@@ -606,7 +607,6 @@ mrb_code_fetch_hook(mrb_state *mrb, mrb_irep *irep, mrb_code *pc, mrb_value *reg
     }
     dbg->prvfile = file;
     dbg->prvline = line;
-    dbg->prvci = mrb->c->ci;
     return;
   case DBG_INIT:
     dbg->root_irep = irep;
-- 
cgit v1.2.3