diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm index a70cb72f0f..a07cf97585 100644 --- a/iphone/Maps/Classes/MapsAppDelegate.mm +++ b/iphone/Maps/Classes/MapsAppDelegate.mm @@ -506,7 +506,11 @@ using namespace osm_auth_ios; #pragma mark - Properties - (MapViewController *)mapViewController { - return [(UINavigationController *)self.window.rootViewController viewControllers].firstObject; + auto obj = [(UINavigationController *)self.window.rootViewController viewControllers].firstObject; + if ([obj isKindOfClass:[MapViewController class]]) + return obj; + else + return nil; } - (MWMCarPlayService *)carplayService {