--- rxvt-unicode/src/main.C	2005/12/21 19:50:16	1.151
+++ rxvt-unicode/src/main.C	2005/12/27 12:23:37	1.153
@@ -291,6 +291,15 @@
 }
 
 void
+rxvt_term::child_exit ()
+{
+  cmd_pid = 0;
+
+  if (!(options & Opt_hold))
+    destroy ();
+}
+
+void
 rxvt_term::destroy ()
 {
   if (destroy_ev.active)
@@ -524,7 +533,7 @@
       for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
         if (pid == (*t)->cmd_pid)
           {
-            (*t)->destroy ();
+            (*t)->child_exit ();
             break;
           }
   }
@@ -937,7 +946,6 @@
 
 void rxvt_term::set_string_property (Atom prop, const char *str, int len)
 {
-  // TODO: SMART_WINDOW_TITLE
   XChangeProperty (display->display, parent[0],
                    prop, XA_STRING, 8, PropModeReplace,
                    (const unsigned char *)str, len >= 0 ? len : strlen (str));
@@ -945,7 +953,6 @@
 
 void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
 {
-  // TODO: SMART_WINDOW_TITLE
   wchar_t *ws = rxvt_mbstowcs (str, len);
   char *s = rxvt_wcstoutf8 (ws);