bindings up draft
authorManish Goregaokar <manishearth@gmail.com>
Tue, 04 Apr 2017 15:43:28 -0700
changeset 557487 30c2c608336b9153ee403887ad41b66cf14657cd
parent 556318 78409962d8c273524f340d01a6621118a1a6abdf
child 557488 b49828142ef323f6fd3346303de1f307bae448e3
push id52748
push userbmo:manishearth@gmail.com
push dateThu, 06 Apr 2017 23:02:15 +0000
milestone55.0a1
bindings up MozReview-Commit-ID: L7l8455zvE1
modules/libpref/Preferences.cpp
--- a/modules/libpref/Preferences.cpp
+++ b/modules/libpref/Preferences.cpp
@@ -472,21 +472,20 @@ Preferences::IsServiceAvailable()
 {
   return !!sPreferences;
 }
 
 // static
 bool
 Preferences::InitStaticMembers()
 {
+  if (!sShutdown && !sPreferences) {
 #ifndef MOZ_B2G
-  MOZ_ASSERT(NS_IsMainThread());
+    MOZ_ASSERT(NS_IsMainThread());
 #endif
-
-  if (!sShutdown && !sPreferences) {
     nsCOMPtr<nsIPrefService> prefService =
       do_GetService(NS_PREFSERVICE_CONTRACTID);
   }
 
   return sPreferences != nullptr;
 }
 
 // static