diff --git a/gdb/tui/ChangeLog b/gdb/tui/ChangeLog
index 20315879802..a7d3f43965f 100644
--- a/gdb/tui/ChangeLog
+++ b/gdb/tui/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-01  Stephane Carrez  <stcarrez@nerim.fr>
+
+	* tuiWin.c (_tuiAllWindowsInfo): Don't crash if the window
+	is not displayed.
+
 2002-09-01  Stephane Carrez  <stcarrez@nerim.fr>
 
 	* tui-out.c (tui_out_new): Clear start_of_line.
diff --git a/gdb/tui/tuiWin.c b/gdb/tui/tuiWin.c
index 82c3d4951f4..aa829ec78e4 100644
--- a/gdb/tui/tuiWin.c
+++ b/gdb/tui/tuiWin.c
@@ -928,7 +928,7 @@ _tuiAllWindowsInfo (char *arg, int fromTTY)
   TuiWinInfoPtr winWithFocus = tuiWinWithFocus ();
 
   for (type = SRC_WIN; (type < MAX_MAJOR_WINDOWS); type++)
-    if (winList[type]->generic.isVisible)
+    if (winList[type] && winList[type]->generic.isVisible)
       {
 	if (winWithFocus == winList[type])
 	  printf_filtered ("        %s\t(%d lines)  <has focus>\n",