--- rxvt-unicode/src/main.C	2006/01/12 01:30:53	1.176
+++ rxvt-unicode/src/main.C	2006/01/16 08:29:57	1.178
@@ -379,7 +379,7 @@
 void
 rxvt_term::destroy_cb (time_watcher &w)
 {
-  SET_R (this);
+  make_current ();
 
   delete this;
 }
@@ -480,9 +480,8 @@
 rxvt_term::init (int argc, const char *const *argv)
 {
   SET_R (this);
-  set_environ (envv); // few things in X do not call setlocale :(
-
   set_locale ("");
+  set_environ (envv); // few things in X do not call setlocale :(
 
   if (!init_vars ())
     return false;
@@ -1629,7 +1628,7 @@
   char **s;
   char buf[IMBUFSIZ];
 
-  SET_R (this);
+  make_current ();
 
   im_destroy ();