--- rxvt-unicode/src/init.C	2012/01/09 15:30:17	1.314
+++ rxvt-unicode/src/init.C	2012/01/09 15:45:45	1.316
@@ -854,7 +854,7 @@
   rootwin_ev.start (display, display->root);
 #endif
 
-  set_colorfgbg ();
+  init_done = 1;
 
   init_command (cmd_argv);
 
@@ -909,6 +909,8 @@
 {
   char *val;
   char *env_display;
+  char *env_windowid;
+  char *env_colorfgbg;
   char *env_term;
 
 #ifdef DISPLAY_IS_IP
@@ -936,6 +938,7 @@
 
   sprintf (env_display, "DISPLAY=%s", val);
 
+  env_windowid = (char *)rxvt_malloc (21);
   sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
 
   /* add entries to the environment:
@@ -949,8 +952,8 @@
   putenv (env_display);
   putenv (env_windowid);
 
-  if (env_colorfgbg)
-    putenv (env_colorfgbg);
+  env_colorfgbg = get_colorfgbg ();
+  putenv (env_colorfgbg);
 
 #ifdef RXVT_TERMINFO
   putenv ("TERMINFO=" RXVT_TERMINFO);