Merge pull request #1652 from mapbox/1ec5-init-nil

1ec5 · 1ec5 · commit ceef4d38419a · 2015-05-27T12:48:08.000-07:00
Return nil upon failure to initialize
diff --git a/platform/ios/MGLMapView.mm b/platform/ios/MGLMapView.mm
@@ -132,9 +132,10 @@ - (instancetype)initWithFrame:(CGRect)frame styleURL:(NSURL *)styleURL
     if (self && [self commonInit])
     {
         self.styleURL = styleURL;
+        return self;
     }
 
-    return self;
+    return nil;
 }
 
 - (instancetype)initWithCoder:(NSCoder *)decoder

Original file line number	Diff line number	Diff line change
`@@ -132,9 +132,10 @@ - (instancetype)initWithFrame:(CGRect)frame styleURL:(NSURL *)styleURL`
`132`	`132`	`if (self && [self commonInit])`
`133`	`133`	`{`
`134`	`134`	`self.styleURL = styleURL;`
	`135`	`+ return self;`
`135`	`136`	`}`
`136`	`137`
`137`		`- return self;`
	`138`	`+ return nil;`
`138`	`139`	`}`
`139`	`140`
`140`	`141`	`- (instancetype)initWithCoder:(NSCoder *)decoder`