Changeset de6f317

Timestamp:

Sep 18, 2010, 3:14:31 PM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.7, release-1.8, release-1.9

Children:

9c678a5

Parents:

3ecd78b

git-author:

David Benjamin <davidben@mit.edu> (09/14/10 17:57:36)

git-committer:

David Benjamin <davidben@mit.edu> (09/18/10 15:14:31)

Message:

Move zephyr and ncurses shutdown into main

They are initialized in main, so they may as well be tore down there.
Although, we'll probably want to move both elsewhere sometime.

Files:

• functions.c (modified) (2 diffs)
• owl.c (modified) (2 diffs)

functions.c

@@ -960 +960 @@
     kill(owl_global_get_newmsgproc_pid(&g), SIGHUP);
   }
-
-  /* Quit zephyr */
-  owl_zephyr_shutdown();
   
   /* Quit AIM */
@@ -968 +965 @@
     owl_aim_logout();
   }
-
-  /* done with curses */
-  endwin();
-
-  /* restore terminal settings */
-  tcsetattr(0, TCSAFLUSH, owl_global_get_startup_tio(&g));
 
   owl_function_debugmsg("Quitting Owl");

owl.c

@@ -149 +149 @@
 }
 
+void owl_shutdown_curses(void) {
+  endwin();
+  /* restore terminal settings */
+  tcsetattr(0, TCSAFLUSH, owl_global_get_startup_tio(&g));
+}
 
 /*
@@ -585 +590 @@
   owl_function_debugmsg("startup: entering main loop");
   owl_select_run_loop();
+
+  /* Shut down everything. */
+  owl_zephyr_shutdown();
+  owl_shutdown_curses();
   return 0;
 }