From 6427a8d42b2e3ffc3ee4b496a104e205086fada2 Mon Sep 17 00:00:00 2001 From: "bryner%brianryner.com" Date: Wed, 14 Apr 2004 04:48:02 +0000 Subject: [PATCH] Fix bug 240174 ('no running window found' on startup). r+sr=blizzard, a=dbaron. git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_7_BRANCH@154854 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/toolkit/xre/nsAppRunner.cpp | 3 +++ mozilla/xpfe/bootstrap/nsAppRunner.cpp | 3 +++ 2 files changed, 6 insertions(+) diff --git a/mozilla/toolkit/xre/nsAppRunner.cpp b/mozilla/toolkit/xre/nsAppRunner.cpp index 55aba811a21..73dd20cd9ab 100644 --- a/mozilla/toolkit/xre/nsAppRunner.cpp +++ b/mozilla/toolkit/xre/nsAppRunner.cpp @@ -1472,6 +1472,9 @@ static int HandleRemoteArguments(int argc, char* argv[], PRBool *aArgUsed) } } + if (!remote) + return 0; // No remote argument == success + // try to get the X remote client nsCOMPtr client (do_CreateInstance(NS_XREMOTECLIENT_CONTRACTID)); if (!client) diff --git a/mozilla/xpfe/bootstrap/nsAppRunner.cpp b/mozilla/xpfe/bootstrap/nsAppRunner.cpp index 594d33ed426..d50326da4d4 100644 --- a/mozilla/xpfe/bootstrap/nsAppRunner.cpp +++ b/mozilla/xpfe/bootstrap/nsAppRunner.cpp @@ -1469,6 +1469,9 @@ static int HandleRemoteArguments(int argc, char* argv[], PRBool *aArgUsed) } } + if (!remote) + return 0; // No remote argument == success + // try to get the X remote client nsCOMPtr client (do_CreateInstance(NS_XREMOTECLIENT_CONTRACTID)); if (!client)