diff options
Diffstat (limited to 'ncurses/base/lib_endwin.c')
| -rw-r--r-- | ncurses/base/lib_endwin.c | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/ncurses/base/lib_endwin.c b/ncurses/base/lib_endwin.c index b8a9e4e66a4d..85d2bdbaac05 100644 --- a/ncurses/base/lib_endwin.c +++ b/ncurses/base/lib_endwin.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2023 Thomas E. Dickey * * Copyright 1998-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -43,7 +43,7 @@ #include <curses.priv.h> -MODULE_ID("$Id: lib_endwin.c,v 1.25 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_endwin.c,v 1.28 2023/11/11 21:27:32 tom Exp $") NCURSES_EXPORT(int) NCURSES_SP_NAME(endwin) (NCURSES_SP_DCL0) @@ -52,20 +52,24 @@ NCURSES_SP_NAME(endwin) (NCURSES_SP_DCL0) T((T_CALLED("endwin(%p)"), (void *) SP_PARM)); - if (SP_PARM) { + if (SP_PARM != NULL) { + if (SP_PARM->_endwin != ewSuspend) { #ifdef USE_TERM_DRIVER - TERMINAL_CONTROL_BLOCK *TCB = TCBOf(SP_PARM); + TERMINAL_CONTROL_BLOCK *TCB = TCBOf(SP_PARM); - SP_PARM->_endwin = ewSuspend; - if (TCB && TCB->drv && TCB->drv->td_scexit) - TCB->drv->td_scexit(SP_PARM); + SP_PARM->_endwin = ewSuspend; + if (TCB && TCB->drv && TCB->drv->td_scexit) + TCB->drv->td_scexit(SP_PARM); #else - SP_PARM->_endwin = ewSuspend; - SP_PARM->_mouse_wrap(SP_PARM); - _nc_screen_wrap(); - _nc_mvcur_wrap(); /* wrap up cursor addressing */ + SP_PARM->_endwin = ewSuspend; + SP_PARM->_mouse_wrap(SP_PARM); + _nc_screen_wrap(); + _nc_mvcur_wrap(); /* wrap up cursor addressing */ #endif - code = NCURSES_SP_NAME(reset_shell_mode) (NCURSES_SP_ARG); + code = OK; + } + if (NCURSES_SP_NAME(reset_shell_mode) (NCURSES_SP_ARG) == ERR) + code = ERR; } returnCode(code); |