mozilla-inbound: changeset 225939:cc42921d3f3603b6983a6edd008296c8fbe8b1bd

☠☠ backed out by 80b882dbd0cc ☠ ☠
author	Garvan Keeley <gkeeley@mozilla.com>
	Wed, 14 Jan 2015 20:02:00 +0100
changeset 225939	cc42921d3f3603b6983a6edd008296c8fbe8b1bd
parent 225938	6f507c077b24c45a283c500aea3b355c32d56e75
child 225940	32fe616d49503106a386d172ca2367453c2de77b
push id	54707
push user	cbook@mozilla.com
push date	Tue, 27 Jan 2015 07:45:11 +0000
treeherder	mozilla-inbound@32fe616d4950 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	dougt
bugs	1121497
milestone	38.0a1
first release with	nightly linux32 b2b10231606b / 38.0a1 / 20150128030203 / files nightly linux64 b2b10231606b / 38.0a1 / 20150128030203 / files nightly mac b2b10231606b / 38.0a1 / 20150128030203 / files nightly win32 b2b10231606b / 38.0a1 / 20150128030203 / files nightly win64 b2b10231606b / 38.0a1 / 20150128030203 / files
last release without	nightly linux32 38e4719e71af / 38.0a1 / 20150127030230 / files nightly linux64 38e4719e71af / 38.0a1 / 20150127030230 / files nightly mac 38e4719e71af / 38.0a1 / 20150127030230 / files nightly win32 38e4719e71af / 38.0a1 / 20150127030230 / files nightly win64 38e4719e71af / 38.0a1 / 20150127030230 / files

--- a/dom/system/mac/CoreLocationLocationProvider.mm
+++ b/dom/system/mac/CoreLocationLocationProvider.mm
@@ -206,16 +206,18 @@ CoreLocationLocationProvider::Startup()
     nsAutoPtr<CoreLocationObjects> clObjs(new CoreLocationObjects());
 
     nsresult rv = clObjs->Init(this);
     NS_ENSURE_SUCCESS(rv, rv);
 
     mCLObjects = clObjs.forget();
   }
 
+  // Must be stopped before starting or response (success or failure) is not guaranteed
+  [mCLObjects->mLocationManager stopUpdatingLocation];
   [mCLObjects->mLocationManager startUpdatingLocation];
   return NS_OK;
 }
 
 NS_IMETHODIMP
 CoreLocationLocationProvider::Watch(nsIGeolocationUpdate* aCallback)
 {
   if (mCallback) {