author | Dave Townsend <dtownsend@oxymoronical.com> |
Wed, 13 Feb 2019 16:36:02 +0000 | |
changeset 458912 | 9c47d4f6747a |
parent 458911 | 6e651b1b00b1 |
child 458913 | ac92eed544e9 |
push id | 35551 |
push user | shindli@mozilla.com |
push date | Wed, 13 Feb 2019 21:34:09 +0000 |
treeherder | mozilla-central@08f794a4928e [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | bzbarsky |
bugs | 1527374 |
milestone | 67.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -4235,17 +4235,19 @@ int XREMain::XRE_mainStartup(bool* aExit bool cachesOK; bool isDowngrade; nsCString lastVersion; bool versionOK = CheckCompatibility( mProfD, version, osABI, mDirProvider.GetGREDir(), mAppData->directory, flagFile, &cachesOK, &isDowngrade, lastVersion); #ifdef MOZ_BLOCK_PROFILE_DOWNGRADE - if (isDowngrade && !CheckArg("allow-downgrade")) { + // The argument check must come first so the argument is always removed from + // the command line regardless of whether this is a downgrade or not. + if (!CheckArg("allow-downgrade") && isDowngrade) { rv = CheckDowngrade(mProfD, mNativeApp, mProfileSvc, lastVersion); if (rv == NS_ERROR_LAUNCHED_CHILD_PROCESS || rv == NS_ERROR_ABORT) { *aExitFlag = true; return 0; } } #endif