Bug 153324 user.js not loaded if prefs.js doesn't exist.

patch by tranquil@mail.dk r=bnesse sr=alecf git-svn-id: svn://10.0.0.236/trunk@127077 18797224-902f-48f8-a5cc-f745e15eee43
2002-08-12 14:52:32 +00:00
parent 3da59b3ddc
commit 254ce23d7b
1 changed files with 2 additions and 3 deletions
--- a/mozilla/modules/libpref/src/nsPrefService.cpp
+++ b/mozilla/modules/libpref/src/nsPrefService.cpp
@@ -180,9 +180,8 @@ NS_IMETHODIMP nsPrefService::ReadUserPrefs(nsIFile *aFile)
  nsresult rv;

  if (nsnull == aFile) {
-    rv = UseDefaultPrefFile();  // really should return a value...
-    if (NS_SUCCEEDED(rv))
-      UseUserPrefFile(); 
+    rv = UseDefaultPrefFile();
+    UseUserPrefFile();

    NotifyServiceObservers(NS_PREFSERVICE_READ_TOPIC_ID);