--- a/content/events/src/nsDOMTouchEvent.cpp
+++ b/content/events/src/nsDOMTouchEvent.cpp
@@ -188,40 +188,42 @@ namespace mozilla {
 namespace widget {
 extern int32_t IsTouchDeviceSupportPresent();
 } }
 #endif
 
 bool
 nsDOMTouchEvent::PrefEnabled()
 {
-  static bool sDidCheckPref = false;
-  static bool sPrefValue = false;
-  if (!sDidCheckPref) {
-    sDidCheckPref = true;
-    int32_t flag = 0;
-    if (NS_SUCCEEDED(Preferences::GetInt("dom.w3c_touch_events.enabled",
-                                         &flag))) {
-      if (flag == 2) {
+  bool prefValue = false;
+  int32_t flag = 0;
+  if (NS_SUCCEEDED(Preferences::GetInt("dom.w3c_touch_events.enabled",
+                                        &flag))) {
+    if (flag == 2) {
 #ifdef XP_WIN
-        // On Windows we auto-detect based on device support.
-        sPrefValue = mozilla::widget::IsTouchDeviceSupportPresent();
+      static bool sDidCheckTouchDeviceSupport = false;
+      static bool sIsTouchDeviceSupportPresent = false;
+      // On Windows we auto-detect based on device support.
+      if (!sDidCheckTouchDeviceSupport) {
+        sDidCheckTouchDeviceSupport = true;
+        sIsTouchDeviceSupportPresent = mozilla::widget::IsTouchDeviceSupportPresent();
+      }
+      prefValue = sIsTouchDeviceSupportPresent;
 #else
-        NS_WARNING("dom.w3c_touch_events.enabled=2 not implemented!");
-        sPrefValue = false;
+      NS_WARNING("dom.w3c_touch_events.enabled=2 not implemented!");
+      prefValue = false;
 #endif
-      } else {
-        sPrefValue = !!flag;
-      }
-    }
-    if (sPrefValue) {
-      nsContentUtils::InitializeTouchEventTable();
+    } else {
+      prefValue = !!flag;
     }
   }
-  return sPrefValue;
+  if (prefValue) {
+    nsContentUtils::InitializeTouchEventTable();
+  }
+  return prefValue;
 }
 
 nsresult
 NS_NewDOMTouchEvent(nsIDOMEvent** aInstancePtrResult,
                     mozilla::dom::EventTarget* aOwner,
                     nsPresContext* aPresContext,
                     nsTouchEvent *aEvent)
 {