ncurses 5.7 - patch 20101225

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

diff --git a/ncurses/base/lib_restart.c b/ncurses/base/lib_restart.c
index 55b1cc09cfa7eeaf20485825dfd434ec6e3187c6..b28cfd1f2ffdc322cc9e19ed4645a716b86a571b 100644 (file)
--- a/ncurses/base/lib_restart.c
+++ b/ncurses/base/lib_restart.c
@@ -45,7 +45,7 @@
 #define _POSIX_SOURCE
 #endif
 
-MODULE_ID("$Id: lib_restart.c,v 1.11 2009/05/02 20:47:42 tom Exp $")
+MODULE_ID("$Id: lib_restart.c,v 1.13 2009/10/24 22:47:43 tom Exp $")
 
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(restartterm) (NCURSES_SP_DCLx
@@ -54,10 +54,17 @@ NCURSES_SP_NAME(restartterm) (NCURSES_SP_DCLx
                              int *errret)
 {
     int result;
+#ifdef USE_TERM_DRIVER
+    TERMINAL *new_term;
+#endif
 
-    T((T_CALLED("restartterm(%p,%s,%d,%p)"), SP_PARM, termp, filenum, errret));
+    T((T_CALLED("restartterm(%p,%s,%d,%p)"),
+       (void *) SP_PARM,
+       termp,
+       filenum,
+       (void *) errret));
 
-    if (setupterm(termp, filenum, errret) != OK) {
+    if (TINFO_SETUP_TERM(&new_term, termp, filenum, errret, FALSE) != OK) {
        result = ERR;
     } else if (SP_PARM != 0) {
        int saveecho = SP_PARM->_echo;
@@ -65,6 +72,9 @@ NCURSES_SP_NAME(restartterm) (NCURSES_SP_DCLx
        int saveraw = SP_PARM->_raw;
        int savenl = SP_PARM->_nl;
 
+#ifdef USE_TERM_DRIVER
+       SP_PARM->_term = new_term;
+#endif
        if (saveecho) {
            NCURSES_SP_NAME(echo) (NCURSES_SP_ARG);
        } else {