Bug 809758 - Ensure sGeoInitPending is set to false prior to notifying ServiceReady. r=gwagner. a=blocking-basecamp
authorDoug Turner <dougt@dougt.org>
Tue, 13 Nov 2012 15:03:06 -0800
changeset 113144 9360711fad95dd3a73efd1bcc451602da2491ea3
parent 113143 5db578a8dffa334a914bb175d4cca5c28380e3aa
child 113145 9707fdeafe857f02c6d70658656f2218bedb84bb
push id23859
push useremorley@mozilla.com
push dateWed, 14 Nov 2012 14:36:31 +0000
treeherdermozilla-central@87928cd21b40 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgwagner, blocking-basecamp
bugs809758
milestone19.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 809758 - Ensure sGeoInitPending is set to false prior to notifying ServiceReady. r=gwagner. a=blocking-basecamp
dom/src/geolocation/nsGeolocation.cpp
--- a/dom/src/geolocation/nsGeolocation.cpp
+++ b/dom/src/geolocation/nsGeolocation.cpp
@@ -741,21 +741,20 @@ nsGeolocationService::HandleMozsettingVa
       Update(nullptr);
       mLastPosition = nullptr;
       sGeoEnabled = false;
     } else {
       sGeoEnabled = true;
     }
 
     if (sGeoInitPending) {
+      sGeoInitPending = false;
       for (uint32_t i = 0, length = mGeolocators.Length(); i < length; ++i) {
         mGeolocators[i]->ServiceReady();
       }
-
-      sGeoInitPending = false;
     }
 }
 
 NS_IMETHODIMP
 nsGeolocationService::Observe(nsISupports* aSubject,
                               const char* aTopic,
                               const PRUnichar* aData)
 {