- call any::ask_window_manager_to_logout() after forking so that exit doesn't happen before it is done

  (otherwise it can loose Xauth access)
- fix checking config_changed (it can be string 'config_changed' or the new $raw_X)

1 files changed, 5 insertions, 3 deletions

diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake
index 6b0adb4aa..6f88662cd 100755
--- a/perl-install/standalone/XFdrake
+++ b/perl-install/standalone/XFdrake
@@ -57,7 +57,7 @@ $configure_this ||= 'everything';
 	    Xconfig::main::configure_resolution($in, Xconfig::xfree->read);
 	}
     };
-    $rc && $rc eq 'config_changed' and ask_for_X_restart($in);
+    ask_for_X_restart($in) if $rc;
 
     $in->exit(0);
 }
@@ -92,8 +92,10 @@ sub ask_for_X_restart {
 
     $in->ask_okcancel('', N("You need to log out and back in again for changes to take effect"), 1) or return;
 
-    fork() and return;
-    any::ask_window_manager_to_logout($wm);
+    if (fork()) {
+	any::ask_window_manager_to_logout($wm);
+	return;
+    }
     
     open STDIN, "</dev/zero";
     open STDOUT, ">/dev/null";