--- rxvt-unicode/src/main.C	2004/02/11 08:13:45	1.29
+++ rxvt-unicode/src/main.C	2004/02/13 12:11:05	1.31
@@ -123,6 +123,7 @@
   // TODO: free pixcolours, colours should become part of rxvt_display
 
   delete PixColors;
+  delete TermWin.fontset;
 
   displays.put (display);
 }
@@ -135,6 +136,7 @@
       if (TermWin.parent[0])
         XDestroyWindow (display->display, TermWin.parent[0]);
 
+      rootwin_ev.stop (display);
       termwin_ev.stop (display);
       vt_ev.stop (display);
 
@@ -323,12 +325,12 @@
 RETSIGTYPE
 rxvt_Exit_signal(int sig)
 {
-  signal(sig, SIG_DFL);
+  signal (sig, SIG_DFL);
 #ifdef DEBUG_CMD
-  rxvt_print_error("signal %d", sig);
+  rxvt_print_error ("signal %d", sig);
 #endif
   rxvt_clean_exit();
-  kill(getpid(), sig);
+  kill (getpid (), sig);
 }
 
 /* INTPROTO */
@@ -355,7 +357,9 @@
 void
 rxvt_clean_exit ()
 {
-  GET_R->destroy ();
+  // TODO: rxvtd should clean up all ressources
+  if (GET_R)
+    GET_R->destroy ();
 }
 
 /* ------------------------------------------------------------------------- *