From 07a41f9e0bdedf613cf5eaabcd0c2f78d4870ca8 Mon Sep 17 00:00:00 2001
From: jfreegman <jfreegman@gmail.com>
Date: Mon, 25 Jan 2021 17:09:23 -0500
Subject: [PATCH] Show previous window instead of Home after closing a window

---
 src/windows.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/windows.c b/src/windows.c
index bda7acb..5f16fac 100644
--- a/src/windows.c
+++ b/src/windows.c
@@ -367,7 +367,9 @@ void set_active_window_index(uint8_t index)
     }
 }
 
-/* Shows next window when tab or back-tab is pressed */
+/* Displays the next window if `ch` is equal to the next window key binding.
+ * Otherwise displays the previous window.
+ */
 void set_next_window(int ch)
 {
     if (ch == user_settings->key_next_tab) {
@@ -394,8 +396,6 @@ void set_next_window(int ch)
 /* Deletes window w and cleans up */
 void del_window(ToxWindow *w)
 {
-    set_active_window_index(0);
-
     uint8_t idx = w->index;
     delwin(w->window_bar);
     delwin(w->window);
@@ -404,7 +404,11 @@ void del_window(ToxWindow *w)
 
     clear();
     refresh();
-    --num_active_windows;
+
+    if (num_active_windows > 0) {
+        set_next_window(-1);
+        --num_active_windows;
+    }
 }
 
 ToxWindow *init_windows(Tox *m)