From eefa8a03dfd1b89b6c04d332fea5db3bf7c138b3 Mon Sep 17 00:00:00 2001 From: "bsmedberg%covad.net" Date: Mon, 11 Apr 2005 12:34:44 +0000 Subject: [PATCH] Bug 289383 - Cannot force automatic xremote off: add the same MOZ_NO_REMOTE environment check that we use on Windows r=dbaron sr=jst a=caillon git-svn-id: svn://10.0.0.236/trunk@171968 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/toolkit/xre/nsAppRunner.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/mozilla/toolkit/xre/nsAppRunner.cpp b/mozilla/toolkit/xre/nsAppRunner.cpp index c4375bb2980..4b13436b8fb 100644 --- a/mozilla/toolkit/xre/nsAppRunner.cpp +++ b/mozilla/toolkit/xre/nsAppRunner.cpp @@ -783,12 +783,6 @@ DumpHelp() #if defined(XP_WIN) || defined(XP_OS2) printf("%s-console%sStart %s with a debugging console.\n",HELP_SPACER_1,HELP_SPACER_2,gAppData->appName); #endif -#ifdef MOZ_ENABLE_XREMOTE - printf("%s-remote %sExecute in an already running\n" - "%sMozilla process. For more info, see:\n" - "\n%shttp://www.mozilla.org/unix/remote.html\n\n", - HELP_SPACER_1,HELP_SPACER_1,HELP_SPACER_4,HELP_SPACER_2); -#endif // this works, but only after the components have registered. so if you drop in a new command line handler, -help // won't not until the second run. @@ -1802,9 +1796,11 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData) return HandleRemoteArgument(xremotearg); } - // Try to remote the entire command line. If this fails, start up normally. - if (RemoteCommandLine()) - return 0; + if (!PR_GetEnv("MOZ_NO_REMOTE")) { + // Try to remote the entire command line. If this fails, start up normally. + if (RemoteCommandLine()) + return 0; + } #endif nsCOMPtr profileLock;