Fixed deadlock when command errors

sharkdp · Dec 11, 2024 · fdbbb3b · fdbbb3b
1 parent a7a93c9
commit fdbbb3b
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/numbat-cli/src/main.rs b/numbat-cli/src/main.rs
@@ -370,10 +370,11 @@ impl Cli {
 
                     rl.add_history_entry(&line)?;
 
+                    let mut ctx = self.context.lock().unwrap();
                     match cmd_runner.try_run_command(
                         &line,
                         CommandContext {
-                            ctx: &mut self.context.lock().unwrap(),
+                            ctx: &mut ctx,
                             editor: rl,
                         },
                     ) {
@@ -383,10 +384,11 @@ impl Cli {
                             CommandControlFlow::NotACommand => {}
                         },
                         Err(err) => {
-                            self.context.lock().unwrap().print_diagnostic(*err);
+                            ctx.print_diagnostic(*err);
                             continue;
                         }
                     }
+                    drop(ctx);
 
                     let ParseEvaluationOutcome {
                         control_flow,