From 9712cec06bcddf5ee8507956541f78355d14fbb7 Mon Sep 17 00:00:00 2001
From: Garvan Keeley <gkeeley@mozilla.com>
Date: Wed, 14 Jan 2015 20:02:00 +0100
Subject: [PATCH] Bug 1121497 - Need to stop location manager before start,
 r=dougt

---
 dom/system/mac/CoreLocationLocationProvider.mm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dom/system/mac/CoreLocationLocationProvider.mm b/dom/system/mac/CoreLocationLocationProvider.mm
index 9032e3bdb584..242065bebd50 100644
--- a/dom/system/mac/CoreLocationLocationProvider.mm
+++ b/dom/system/mac/CoreLocationLocationProvider.mm
@@ -211,6 +211,8 @@ CoreLocationLocationProvider::Startup()
     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;
 }