Bug 451161 - Part 3: Reverse the reading order of user prefs and AutoConfig. r=roc
authorMasatoshi Kimura <VYV03354@nifty.ne.jp>
Sat, 26 Nov 2011 20:50:05 +0100
changeset 82485 aa093660a497227e2183da6339c799b38a49b90e
parent 82484 62f14bed35a21aba3062eae10c16c4da17c83529
child 82486 300d9c4a3b9af31c471d0a99906781d5836f1e9e
push idunknown
push userunknown
push dateunknown
reviewersroc
bugs451161
milestone11.0a1
Bug 451161 - Part 3: Reverse the reading order of user prefs and AutoConfig. r=roc
modules/libpref/src/Preferences.cpp
--- a/modules/libpref/src/Preferences.cpp
+++ b/modules/libpref/src/Preferences.cpp
@@ -396,21 +396,21 @@ Preferences::ReadUserPrefs(nsIFile *aFil
   if (XRE_GetProcessType() == GeckoProcessType_Content) {
     NS_ERROR("cannot load prefs from content process");
     return NS_ERROR_NOT_AVAILABLE;
   }
 
   nsresult rv;
 
   if (nsnull == aFile) {
-    rv = UseDefaultPrefFile();
-    UseUserPrefFile();
 
     NotifyServiceObservers(NS_PREFSERVICE_READ_TOPIC_ID);
 
+    rv = UseDefaultPrefFile();
+    UseUserPrefFile();
   } else {
     rv = ReadAndOwnUserPrefFile(aFile);
   }
   return rv;
 }
 
 NS_IMETHODIMP
 Preferences::ResetPrefs()