Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 12423,Read user.js on startup after prefs.js is read.r=alecf

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@64567 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
neeti%netscape.com
2000-03-30 04:25:07 +00:00
parent b1ccfbf2cb
commit ba594f9c4e
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mozilla/modules/libpref/src/nsPref.cpp
View File

@@ -221,7 +221,16 @@ nsresult nsPref::useUserPrefFile()
if (NS_SUCCEEDED(rv) && userPrefFile)
{
if (NS_SUCCEEDED(userPrefFile->AppendRelativeUnixPath((char*)userFiles[0])))
rv = ReadUserPrefsFrom(userPrefFile);
{
if (NS_FAILED(StartUp()))
return NS_ERROR_FAILURE;
JS_BeginRequest(gMochaContext);
if (pref_OpenFileSpec(userPrefFile, PR_FALSE, PR_FALSE, PR_FALSE, PR_TRUE)
!= PREF_NOERROR)
rv = NS_ERROR_FAILURE;
JS_EndRequest(gMochaContext);
}
}
}
return rv;