Skip to content

Commit

Permalink
Merge pull request #639 from smartdevicelink/hotfix/issue_638
Browse files Browse the repository at this point in the history
Fix crash on connection to some moving vehicles
  • Loading branch information
joeljfischer authored Jul 10, 2017
2 parents 3d4f38f + 364181c commit 46e39d2
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions SmartDeviceLink/SDLLockScreenPresenter.m
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ - (BOOL)presented {
return NO;
}

return (self.viewController.isViewLoaded && self.viewController.view.window);
return (self.viewController.isViewLoaded && (self.viewController.view.window || self.viewController.isBeingPresented));
}

+ (UIViewController *)sdl_getCurrentViewController {
Expand All @@ -54,4 +54,4 @@ + (UIViewController *)sdl_getCurrentViewController {

@end

NS_ASSUME_NONNULL_END
NS_ASSUME_NONNULL_END

0 comments on commit 46e39d2

Please # to comment.