summaryrefslogtreecommitdiff
path: root/src/dged/minibuffer.c
diff options
context:
space:
mode:
authorAlbert Cervin <albert@acervin.com>2024-08-27 23:15:45 +0200
committerAlbert Cervin <albert@acervin.com>2024-08-27 23:18:08 +0200
commit991283f684c224db46fe68738470921b8c394f13 (patch)
treef6af115bc04149776a715b11d8045e3598efcb4e /src/dged/minibuffer.c
parentfb225131a8a3097138d12e50d141de4e0c7b9d7e (diff)
downloaddged-991283f684c224db46fe68738470921b8c394f13.tar.gz
dged-991283f684c224db46fe68738470921b8c394f13.tar.xz
dged-991283f684c224db46fe68738470921b8c394f13.zip
Fix bug where abort switched windows
The minibuffer code for handling going back to previous window after abort was a bit too greedy.
Diffstat (limited to 'src/dged/minibuffer.c')
-rw-r--r--src/dged/minibuffer.c5
1 files changed, 3 insertions, 2 deletions
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); }