Allow rewinding on exceptions

1whatleytay · Feb 13, 2024 · e97b754 · e97b754
1 parent c7f1907
commit e97b754
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/src/state/commands.rs b/src-tauri/src/state/commands.rs
@@ -72,9 +72,7 @@ pub async fn resume(
 
 #[tauri::command]
 pub fn rewind(state: tauri::State<'_, DebuggerBody>, count: u32) -> Option<ResumeResult> {
-    let Some(pointer) = &*state.lock().unwrap() else { return None };
-
-    Some(pointer.rewind(count))
+    Some(state.lock().unwrap().as_ref()?.rewind(count))
 }
 
 #[tauri::command]

diff --git a/src-tauri/src/state/execution.rs b/src-tauri/src/state/execution.rs
@@ -351,6 +351,8 @@ impl<Mem: Memory> ExecutionRewindable for ExecutionState<WatchedMemory<Mem>, His
                 })
             };
 
+            self.debugger.pause();
+
             self.debugger.with_state(|state| {
                 entry.apply(&mut state.registers, &mut state.memory.backing);
             });
-Original file line number
+Diff line change
@@ Expand Up @@
                     })
                 };
+                self.debugger.pause();
                 self.debugger.with_state(|state| {
                     entry.apply(&mut state.registers, &mut state.memory.backing);
                 });
@@ Expand Down @@