Fix bug where abort switched windows

The minibuffer code for handling going back to previous window after abort was a bit too greedy.
datagubbe · Aug 27, 2024 · 991283f · 991283f
1 parent fb22513
commit 991283f
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/dged/minibuffer.c b/src/dged/minibuffer.c
@@ -237,11 +237,12 @@ static void minibuffer_abort_prompt_internal(bool clear) {
   if (clear) {
     minibuffer_clear();
   }
-  g_minibuffer.prompt_active = false;
 
-  if (g_minibuffer.prev_window != NULL) {
+  if (g_minibuffer.prompt_active && g_minibuffer.prev_window != NULL) {
     windows_set_active(g_minibuffer.prev_window);
   }
+
+  g_minibuffer.prompt_active = false;
 }
 
 void minibuffer_abort_prompt() { minibuffer_abort_prompt_internal(true); }