summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Fischer <joeljfischer@gmail.com>2017-07-10 12:37:56 -0400
committerGitHub <noreply@github.com>2017-07-10 12:37:56 -0400
commit46e39d234ea8ffed0df9efd1f7856eb67582dfda (patch)
treecc1d330ae9965d4d62d8730943e72ce3dd69c840
parent3d4f38fa59ca64b5ed8abd7a044fcca08aaecf4c (diff)
parent364181cf1ca4164055224281d4624b696beabf09 (diff)
downloadsdl_ios-46e39d234ea8ffed0df9efd1f7856eb67582dfda.tar.gz
Merge pull request #639 from smartdevicelink/hotfix/issue_638
Fix crash on connection to some moving vehicles
-rw-r--r--SmartDeviceLink/SDLLockScreenPresenter.m4
1 files changed, 2 insertions, 2 deletions
diff --git a/SmartDeviceLink/SDLLockScreenPresenter.m b/SmartDeviceLink/SDLLockScreenPresenter.m
index 024dd36c7..9092972d9 100644
--- a/SmartDeviceLink/SDLLockScreenPresenter.m
+++ b/SmartDeviceLink/SDLLockScreenPresenter.m
@@ -39,7 +39,7 @@ NS_ASSUME_NONNULL_BEGIN
return NO;
}
- return (self.viewController.isViewLoaded && self.viewController.view.window);
+ return (self.viewController.isViewLoaded && (self.viewController.view.window || self.viewController.isBeingPresented));
}
+ (UIViewController *)sdl_getCurrentViewController {
@@ -54,4 +54,4 @@ NS_ASSUME_NONNULL_BEGIN
@end
-NS_ASSUME_NONNULL_END \ No newline at end of file
+NS_ASSUME_NONNULL_END