Bug 311466 - On OS X, open the app in safe-mode if the option key is pressed during startup. r=bsmedberg.

This commit is contained in:
mozilla.mano%sent.com 2005-10-07 18:09:43 +00:00
parent 18433125e1
commit 3f9c1b04d6
2 changed files with 5 additions and 3 deletions

View File

@ -164,6 +164,7 @@
#if defined (XP_MACOSX)
#include <Processes.h>
#include <Events.h>
#endif
extern "C" void ShowOSAlert(const char* aMessage);
@ -1907,7 +1908,11 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
ScopedFPHandler handler;
#endif /* XP_OS2 */
#ifdef XP_MACOSX
if (CheckArg("safe-mode") || GetCurrentKeyModifiers() & optionKey)
#else
if (CheckArg("safe-mode"))
#endif
gSafeMode = PR_TRUE;
// Handle -help and -version command line arguments.

View File

@ -167,9 +167,6 @@ nsresult nsMacCommandLine::Initialize(int& argc, char**& argv)
err = ::AEProcessAppleEvent(&anEvent);
}
}
if (GetCurrentKeyModifiers() & optionKey)
AddToCommandLine("-p");
// we've started up now
mStartedUp = PR_TRUE;