ncurses 5.6 - patch 20080830

[ncurses.git] / ncurses / base / lib_delwin.c

diff --git a/ncurses/base/lib_delwin.c b/ncurses/base/lib_delwin.c
index ba5f180d5f3c9e488103b2c8c550a8d63d209d60..b92c403359584a220126716946a110cd927d671f 100644 (file)
--- 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.16 2008/05/03 14:13:51 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)
@@ -67,12 +67,10 @@ delwin(WINDOW *win)
 
     T((T_CALLED("delwin(%p)"), win));
 
-    if (_nc_try_global(windowlist) == 0) {
-       _nc_lock_window(win);
+    if (_nc_try_global(curses) == 0) {
        if (win == 0
            || cannot_delete(win)) {
            result = ERR;
-           _nc_unlock_window(win);
        } else {
 
            if (win->_flags & _SUBWIN)
@@ -80,10 +78,9 @@ delwin(WINDOW *win)
            else if (curscr != 0)
                touchwin(curscr);
 
-           _nc_unlock_window(win);
            result = _nc_freewin(win);
        }
-       _nc_unlock_global(windowlist);
+       _nc_unlock_global(curses);
     }
     returnCode(result);
 }