author | Wes Johnston <wjohnston@mozilla.com> |
Fri, 05 Oct 2012 17:58:29 -0700 | |
changeset 109474 | 9b6d9a19c61417f4fb7d01cecb64251059b0d747 |
parent 109473 | ac0690ad5138428ea858a0d4a65729d08d87386f |
child 109475 | 8e36fd7113baa49f211599e541f943c685fad335 |
push id | 16045 |
push user | wjohnston@mozilla.com |
push date | Sat, 06 Oct 2012 01:01:36 +0000 |
treeherder | mozilla-inbound@8e36fd7113ba [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | bsmedberg |
bugs | 795406 |
milestone | 18.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 @@ -2215,17 +2215,17 @@ SelectProfile(nsIProfileLock* *aResult, getter_AddRefs(profile)); if (NS_SUCCEEDED(rv)) { if (gDoProfileReset) { NS_WARNING("Profile reset is only supported for the default profile."); gDoProfileReset = false; } nsCOMPtr<nsIProfileUnlocker> unlocker; - rv = profile->Lock(nullptr, aResult); + rv = profile->Lock(getter_AddRefs(unlocker), aResult); if (NS_SUCCEEDED(rv)) { if (aProfileName) aProfileName->Assign(nsDependentCString(arg)); return NS_OK; } return ProfileLockedDialog(profile, unlocker, aNative, aResult); }