From 991283f684c224db46fe68738470921b8c394f13 Mon Sep 17 00:00:00 2001
From: Albert Cervin <albert@acervin.com>
Date: Tue, 27 Aug 2024 23:15:45 +0200
Subject: Fix bug where abort switched windows

The minibuffer code for handling going back to previous window
after abort was a bit too greedy.
---
 src/dged/minibuffer.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/dged')

diff --git a/src/dged/minibuffer.c b/src/dged/minibuffer.c
index 64b0a98..d31850b 100644
--- 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); }
-- 
cgit v1.2.3