Moved map scrolling into its own function with its own sanity checks.

[plomrogue] / windows.c

diff --git a/windows.c b/windows.c
index af6647978a0aa98b2411c6d16e089ef9bcfa99bd..121c9faf369fdc0cd51f7dd9387c11a4b538835f 100644 (file)
--- a/windows.c
+++ b/windows.c
@@ -198,20 +198,21 @@ void resize_window (struct WinMeta * win_meta, char change) {
 
 void cycle_active_window (struct WinMeta * win_meta, char dir) {
 // Cycle active window selection forwards (dir = 'n') or backwards.
-  if ('n' == dir) {
-    if (win_meta->active->next != 0)
-      win_meta->active = win_meta->active->next;
-    else
-      win_meta->active = win_meta->chain_start; }
-  else {
-    if (win_meta->active->prev != 0)
-      win_meta->active = win_meta->active->prev;
-    else
-      win_meta->active = win_meta->chain_end; } }
+  if (0 != win_meta->active) {
+    if ('n' == dir) {
+      if (win_meta->active->next != 0)
+        win_meta->active = win_meta->active->next;
+      else
+        win_meta->active = win_meta->chain_start; }
+    else {
+      if (win_meta->active->prev != 0)
+        win_meta->active = win_meta->active->prev;
+      else
+        win_meta->active = win_meta->chain_end; } } }
 
 void shift_window (struct WinMeta * win_meta, char dir) {
 // Move active window forward/backward in window chain. If jumping beyond start/end, move to other chain end.
-  if (win_meta->chain_start != win_meta->chain_end && (dir == 'f' || dir == 'b')) {
+  if (0 != win_meta->active && win_meta->chain_start != win_meta->chain_end && (dir == 'f' || dir == 'b')) {
     int i, i_max;
     struct Win * win_shift = win_meta->active;
     char wrap = 0;