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

diff --git a/ncurses/base/lib_delwin.c b/ncurses/base/lib_delwin.c
index 3f612bf0..b92c4033 100644
--- a/ncurses/base/lib_delwin.c
+++ b/ncurses/base/lib_delwin.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2001,2007 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -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.17 2008/06/07 14:10:56 tom Exp $")
 
 static bool
 cannot_delete(WINDOW *win)
@@ -48,7 +48,7 @@ cannot_delete(WINDOW *win)
     WINDOWLIST *p;
     bool result = TRUE;
 
-    for (p = _nc_windows; p != 0; p = p->next) {
+    for (each_window(p)) {
 	if (&(p->win) == win) {
 	    result = FALSE;
 	} else if ((p->win._flags & _SUBWIN) != 0
@@ -67,19 +67,20 @@ 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(curses) == 0) {
+	if (win == 0
+	    || cannot_delete(win)) {
+	    result = ERR;
+	} 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);
+	    result = _nc_freewin(win);
+	}
+	_nc_unlock_global(curses);
     }
-    _nc_unlock_global(windowlist);
     returnCode(result);
 }