Call endwin() every time we leave, just in case.

git-svn-id: svn://katsu.triplehelix.org/dgamelaunch/trunk@429 db0b04b0-f4d1-0310-9a6d-de3e77497b0e

diff --git a/dgamelaunch.c b/dgamelaunch.c
index f79bb1022668b832562551b42a0ce76271ebeffc..1beaf015980ed22b6acabc57b721f3a200e979ea 100644 (file)
--- a/dgamelaunch.c
+++ b/dgamelaunch.c
@@ -785,7 +785,6 @@ drawgamemenu(int game)
 
   if (check_retard(0))
   {
-    endwin();
     graceful_exit (119);
   }
 
@@ -834,7 +833,6 @@ drawmenu ()
 
   if (check_retard(0))
   {
-    endwin();
     graceful_exit (119);
   }
 }
@@ -1815,7 +1813,6 @@ menuloop (void)
                  break;
              case ERR:
              case 'q':
-                 endwin ();
                  graceful_exit(0);
                  /* break; */
              case 'r':

diff --git a/dgl-common.c b/dgl-common.c
index 3c2bc58ca719e84d541e01ed896ff663ef19fa9a..b68ff2471c4009c59e2bbfbc110e4c59d1f237f1 100644 (file)
--- a/dgl-common.c
+++ b/dgl-common.c
@@ -223,7 +223,6 @@ dgl_exec_cmdqueue(struct dg_cmdpart *queue, int game, struct dg_user *me)
            if (!loggedin && globalconfig.allow_registration) newuser();
            break;
        case DGLCMD_QUIT:
-           endwin();
            graceful_exit(0);
            /* break; */
        }
@@ -423,6 +422,7 @@ graceful_exit (int status)
      } 
      This doesn't work. Ever.
    */
+  endwin();
   exit (status);
 }