Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-06 16:51:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug #1549 --> netcenter account merges with existing account Landing branch changes to the tip.

Browse Source 
r=bhuvan
This commit is contained in:
mscott%netscape.com 2000-08-03 00:26:09 +00:00
parent 8df1b6e884
commit 5af6562129
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
profile/src/nsProfile.cpp
View File

@ -370,6 +370,10 @@ nsProfile::LoadDefaultProfileDir(nsCString & profileURLStr)
}
mCurrentProfileAvailable = PR_TRUE;
// Now we have the right profile, read the user-specific prefs.
rv = prefs->ReadUserPrefs();
if (NS_FAILED(rv)) return rv;
NS_WITH_SERVICE(nsICategoryManager, catman, NS_CATEGORYMANAGER_PROGID, &rv);
if(NS_SUCCEEDED(rv) && catman)
@ -396,10 +400,6 @@ nsProfile::LoadDefaultProfileDir(nsCString & profileURLStr)
}
}
// Now we have the right profile, read the user-specific prefs.
rv = prefs->ReadUserPrefs();
if (NS_FAILED(rv)) return rv;
nsCOMPtr <nsIPrefConverter> pPrefConverter = do_CreateInstance(kPrefConverterCID, &rv);
if (NS_FAILED(rv)) return rv;