Merge branch 'develop' of https://github.com/smartdevicelink/sdl_ios into develop6.2.3

1 files changed, 8 insertions, 6 deletions

diff --git a/SmartDeviceLink/SDLScreenshotViewController.m b/SmartDeviceLink/SDLScreenshotViewController.m
index 8a817e51d..9ac5f4a8c 100755
--- a/SmartDeviceLink/SDLScreenshotViewController.m
+++ b/SmartDeviceLink/SDLScreenshotViewController.m
@@ -32,12 +32,12 @@
     return self;
 }
 
-    // HAX: https://github.com/smartdevicelink/sdl_ios/issues/1250
+// HAX: https://github.com/smartdevicelink/sdl_ios/issues/1250
 - (UIInterfaceOrientationMask)supportedInterfaceOrientations {
     UIViewController *viewController = [self sdl_topMostControllerForWindow:[UIApplication sharedApplication].windows[0]];
 
     if (viewController == self) {
-        @throw [NSException sdl_invalidLockscreenSetupException];
+        return UIInterfaceOrientationMaskAll;
     } else if (viewController != nil) {
         return viewController.supportedInterfaceOrientations;
     }
@@ -45,21 +45,23 @@
     return UIInterfaceOrientationMaskAll;
 }
 
-    // HAX: https://github.com/smartdevicelink/sdl_ios/issues/1250
+// HAX: https://github.com/smartdevicelink/sdl_ios/issues/1250
 - (BOOL)shouldAutorotate {
     UIViewController *viewController = [self sdl_topMostControllerForWindow:[UIApplication sharedApplication].windows[0]];
 
-    if (viewController != nil) {
+    if (viewController == self) {
+        return YES;
+    } else if (viewController != nil) {
         return viewController.shouldAutorotate;
     }
 
-    return super.shouldAutorotate;
+    return YES;
 }
 
 - (UIViewController *)sdl_topMostControllerForWindow:(UIWindow *)window {
     UIViewController *topController = window.rootViewController;
 
-    while (topController.presentedViewController) {
+    while (topController.presentedViewController != nil) {
         topController = topController.presentedViewController;
     }