moebius#84: Fix: The profile - resetting

https://github.com/MoonchildProductions/moebius/pull/184
This commit is contained in:
janekptacijarabaci 2018-04-19 14:29:05 +02:00 committed by Roy Tam
commit 8523f693be
4 changed files with 14 additions and 2 deletions

View file

@ -3747,7 +3747,12 @@ XREMain::XRE_mainRun()
if (gDoProfileReset) {
// Automatically migrate from the current application if we just
// reset the profile.
aKey = MOZ_APP_NAME;
// For Basilisk and Pale Moon:
// Hard-code MOZ_APP_NAME to firefox because of hard-coded type in migrator.
aKey = (((MOZ_APP_NAME == "basilisk")
|| (MOZ_APP_NAME == "palemoon"))
? "firefox" : MOZ_APP_NAME);
}
pm->Migrate(&mDirProvider, aKey, gResetOldProfileName);
}
@ -3761,6 +3766,7 @@ XREMain::XRE_mainRun()
rv = GetCurrentProfile(mProfileSvc, mProfD, getter_AddRefs(newProfile));
if (NS_SUCCEEDED(rv)) {
newProfile->SetName(gResetOldProfileName);
mProfileName.Assign(gResetOldProfileName);
// Set the new profile as the default after we're done cleaning up the old profile,
// iff that profile was already the default
if (profileWasSelected) {