X-Git-Url: http://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=ncurses%2Fbase%2Flib_getch.c;h=c7ca7aaa43084bc40c0b3d66de092381cbee9860;hb=8f527f87c0b979d9c2598ef5c3394463af288468;hp=56e2a3a874d1de3d1f3efc021493b19f7527c3f0;hpb=4c309ad3b124eff80aa6b54018b5cc9f1e3d116d;p=ncurses.git

diff --git a/ncurses/base/lib_getch.c b/ncurses/base/lib_getch.c
index 56e2a3a8..c7ca7aaa 100644
--- a/ncurses/base/lib_getch.c
+++ b/ncurses/base/lib_getch.c
@@ -41,7 +41,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_getch.c,v 1.96 2008/06/28 23:29:20 tom Exp $")
+MODULE_ID("$Id: lib_getch.c,v 1.97 2008/08/03 22:56:42 tom Exp $")
 
 #include <fifo_defs.h>
 
@@ -284,23 +284,27 @@ recur_wgetnstr(WINDOW *win, char *buf)
     SCREEN *sp = _nc_screen_of(win);
     int rc;
 
+    if (sp != 0) {
 #ifdef USE_PTHREADS
-    if (sp != SP) {
-	SCREEN *save_SP;
-
-	/* temporarily switch to the window's screen to get cooked input */
-	_nc_lock_global(curses);
-	save_SP = SP;
-	_nc_set_screen(sp);
-	rc = recur_wgetnstr(win, buf);
-	_nc_set_screen(save_SP);
-	_nc_unlock_global(curses);
-    } else
+	if (sp != SP) {
+	    SCREEN *save_SP;
+
+	    /* temporarily switch to the window's screen to get cooked input */
+	    _nc_lock_global(curses);
+	    save_SP = SP;
+	    _nc_set_screen(sp);
+	    rc = recur_wgetnstr(win, buf);
+	    _nc_set_screen(save_SP);
+	    _nc_unlock_global(curses);
+	} else
 #endif
-    {
-	sp->_called_wgetch = TRUE;
-	rc = wgetnstr(win, buf, MAXCOLUMNS);
-	sp->_called_wgetch = FALSE;
+	{
+	    sp->_called_wgetch = TRUE;
+	    rc = wgetnstr(win, buf, MAXCOLUMNS);
+	    sp->_called_wgetch = FALSE;
+	}
+    } else {
+	rc = ERR;
     }
     return rc;
 }