summaryrefslogtreecommitdiffstats
path: root/toolkit/xre/nsAppRunner.cpp
diff options
context:
space:
mode:
authorjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-04-19 14:29:05 +0200
committerjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-04-19 14:29:05 +0200
commit1a1d8ddc8cbba1cb405ca62f2be7402e39bb5a68 (patch)
tree7180897e45561a9c1ee75a1b2d6811ce830d62dc /toolkit/xre/nsAppRunner.cpp
parent54c479af3a81f09be57465185d56ab1217a8b47f (diff)
downloadUXP-1a1d8ddc8cbba1cb405ca62f2be7402e39bb5a68.tar
UXP-1a1d8ddc8cbba1cb405ca62f2be7402e39bb5a68.tar.gz
UXP-1a1d8ddc8cbba1cb405ca62f2be7402e39bb5a68.tar.lz
UXP-1a1d8ddc8cbba1cb405ca62f2be7402e39bb5a68.tar.xz
UXP-1a1d8ddc8cbba1cb405ca62f2be7402e39bb5a68.zip
moebius#84: Fix: The profile - resetting
https://github.com/MoonchildProductions/moebius/pull/184
Diffstat (limited to 'toolkit/xre/nsAppRunner.cpp')
-rw-r--r--toolkit/xre/nsAppRunner.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index 9fb20e5e2..a7b2b5146 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -3743,7 +3743,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);
}
@@ -3757,6 +3762,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) {