X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2Flib_delwin.c;h=fc68f9d68deeef6f3f7d1065e0151947ceb53a9f;hp=3f612bf06d79050c3697c59cdd9badd0518c5f43;hb=88d50b5d7057d4f59c586c93ff290d0a39528f70;hpb=b17ff3673e886e3cbb6b523341aa10b0c26b3903

diff --git a/ncurses/base/lib_delwin.c b/ncurses/base/lib_delwin.c
index 3f612bf0..fc68f9d6 100644
--- a/ncurses/base/lib_delwin.c
+++ b/ncurses/base/lib_delwin.c
@@ -40,7 +40,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_delwin.c,v 1.14 2007/10/20 21:51:07 tom Exp $")
+MODULE_ID("$Id: lib_delwin.c,v 1.15 2007/12/22 23:34:26 tom Exp $")
 
 static bool
 cannot_delete(WINDOW *win)
@@ -67,19 +67,23 @@ delwin(WINDOW *win)
 
     T((T_CALLED("delwin(%p)"), win));
 
-    _nc_lock_global(windowlist);
-    if (win == 0
-	|| cannot_delete(win)) {
-	result = ERR;
-    } else {
+    if (_nc_try_global(windowlist) == 0) {
+	_nc_lock_window(win);
+	if (win == 0
+	    || cannot_delete(win)) {
+	    result = ERR;
+	    _nc_unlock_window(win);
+	} else {
 
-	if (win->_flags & _SUBWIN)
-	    touchwin(win->_parent);
-	else if (curscr != 0)
-	    touchwin(curscr);
+	    if (win->_flags & _SUBWIN)
+		touchwin(win->_parent);
+	    else if (curscr != 0)
+		touchwin(curscr);
 
-	result = _nc_freewin(win);
+	    _nc_unlock_window(win);
+	    result = _nc_freewin(win);
+	}
+	_nc_unlock_global(windowlist);
     }
-    _nc_unlock_global(windowlist);
     returnCode(result);
 }