Forráskód Böngészése

Improve behavior when the root view controller on the key window is nil.

Take the default values rather than whatever happens to be 0 if we don’t have a view controller to ask.
Ryan Olson 12 éve
szülő
commit
ac9235a607

+ 4 - 4
Classes/Explorer Toolbar/FLEXExplorerViewController.m

@@ -136,7 +136,7 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
 {
 {
     UIViewController *viewControllerToAsk = [self viewControllerForStatusBarAndOrientationProperties];
     UIViewController *viewControllerToAsk = [self viewControllerForStatusBarAndOrientationProperties];
     UIStatusBarStyle preferredStyle = UIStatusBarStyleDefault;
     UIStatusBarStyle preferredStyle = UIStatusBarStyleDefault;
-    if (viewControllerToAsk != self) {
+    if (viewControllerToAsk && viewControllerToAsk != self) {
         preferredStyle = [viewControllerToAsk preferredStatusBarStyle];
         preferredStyle = [viewControllerToAsk preferredStatusBarStyle];
     }
     }
     return preferredStyle;
     return preferredStyle;
@@ -146,7 +146,7 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
 {
 {
     UIViewController *viewControllerToAsk = [self viewControllerForStatusBarAndOrientationProperties];
     UIViewController *viewControllerToAsk = [self viewControllerForStatusBarAndOrientationProperties];
     UIStatusBarAnimation preferredAnimation = UIStatusBarAnimationFade;
     UIStatusBarAnimation preferredAnimation = UIStatusBarAnimationFade;
-    if (viewControllerToAsk != self) {
+    if (viewControllerToAsk && viewControllerToAsk != self) {
         preferredAnimation = [viewControllerToAsk preferredStatusBarUpdateAnimation];
         preferredAnimation = [viewControllerToAsk preferredStatusBarUpdateAnimation];
     }
     }
     return preferredAnimation;
     return preferredAnimation;
@@ -156,7 +156,7 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
 {
 {
     UIViewController *viewControllerToAsk = [self viewControllerForStatusBarAndOrientationProperties];
     UIViewController *viewControllerToAsk = [self viewControllerForStatusBarAndOrientationProperties];
     BOOL prefersHidden = NO;
     BOOL prefersHidden = NO;
-    if (viewControllerToAsk != self) {
+    if (viewControllerToAsk && viewControllerToAsk != self) {
         prefersHidden = [viewControllerToAsk prefersStatusBarHidden];
         prefersHidden = [viewControllerToAsk prefersStatusBarHidden];
     }
     }
     return prefersHidden;
     return prefersHidden;
@@ -169,7 +169,7 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
 {
 {
     UIViewController *viewControllerToAsk = [self viewControllerForStatusBarAndOrientationProperties];
     UIViewController *viewControllerToAsk = [self viewControllerForStatusBarAndOrientationProperties];
     NSUInteger supportedOrientations = [FLEXUtility infoPlistSupportedInterfaceOrientationsMask];
     NSUInteger supportedOrientations = [FLEXUtility infoPlistSupportedInterfaceOrientationsMask];
-    if (viewControllerToAsk != self) {
+    if (viewControllerToAsk && viewControllerToAsk != self) {
         supportedOrientations = [viewControllerToAsk supportedInterfaceOrientations];
         supportedOrientations = [viewControllerToAsk supportedInterfaceOrientations];
     }
     }