Merge pull request #3145 from srahim/timob-11334

[TIMOB-11334] Fixing Geolocation crasher.
tidev · Oct 12, 2012 · 0586fb4 · 0586fb4
2 parents 3e6c6e3 + a151cd0
commit 0586fb4
Showing 1 changed file with 15 additions and 7 deletions.
diff --git a/iphone/Classes/GeolocationModule.m b/iphone/Classes/GeolocationModule.m
@@ -518,13 +518,9 @@ -(void)getCurrentPosition:(id)callback
 {
 	ENSURE_SINGLE_ARG(callback,KrollCallback);
 	ENSURE_UI_THREAD(getCurrentPosition,callback);
-	if (singleLocation==nil)
-	{
-		singleLocation = [[NSMutableArray alloc] initWithCapacity:1];
-	}
-
+
     // If the location updates are started, invoke the callback directly.
-    if (locationManager!=nil && trackingLocation==YES) {
+    if (locationManager != nil && locationManager.location != nil && trackingLocation == YES ) {
         CLLocation *currentLocation = locationManager.location;
         NSDictionary *todict = [self locationDictionary:currentLocation];
         NSDictionary *event = [NSDictionary dictionaryWithObjectsAndKeys:
@@ -535,6 +531,10 @@ -(void)getCurrentPosition:(id)callback
     }
     // Otherwise, start the location manager.
     else {
+        if (singleLocation==nil)
+        {
+            singleLocation = [[NSMutableArray alloc] initWithCapacity:1];
+        }        
         [singleLocation addObject:callback];
         [self startStopLocationManagerIfNeeded];
     }
@@ -846,7 +846,15 @@ -(void)locationManager:(CLLocationManager *)manager didUpdateLocations:(NSArray
 
 - (void)locationManager:(CLLocationManager *)manager didUpdateToLocation:(CLLocation *)newLocation fromLocation:(CLLocation *)oldLocation
 {
-    [self locationManager:manager didUpdateLocations:[NSArray arrayWithObjects:oldLocation,newLocation,nil]];
+    if (newLocation != nil) {
+        if (oldLocation == nil) {
+            [self locationManager:manager didUpdateLocations:[NSArray arrayWithObject:newLocation]];
+        }
+        else{
+            [self locationManager:manager didUpdateLocations:[NSArray arrayWithObjects:oldLocation,newLocation,nil]];
+        }
+    }
+
 }