smaller bugfixes

OliverLetterer · OliverLetterer · commit 0d2c29bd230e · 2011-10-12T20:38:28.000+02:00
diff --git a/CTSplitViewController/CTSplitViewController.m b/CTSplitViewController/CTSplitViewController.m
@@ -438,10 +438,6 @@ - (void)_hideMasterViewControllerAnimated:(BOOL)animated
 
 - (void)_showMasterViewControllerAnimated:(BOOL)animated
 {
-    if (self.isMasterViewVisible) {
-        return;
-    }
-    
     if (!self.isMasterViewLoaded) {
         [self _loadMasterView];
         
@@ -457,6 +453,7 @@ - (void)_showMasterViewControllerAnimated:(BOOL)animated
     void(^completionBlock)(BOOL finished) = ^(BOOL finished) {
         [self.masterViewController viewDidAppear:animated];
         
+        _detailsView.userInteractionEnabled = YES;
         _masterView.state = CTSplitViewControllerMasterViewStateVisible;
     };
     
@@ -637,9 +634,13 @@ @implementation UIViewController (CTSplitViewController)
 
 - (CTSplitViewController *)CTSplitViewController
 {
+    if ([UIDevice currentDevice].systemVersion.floatValue < 5.0f) {
+        return nil;
+    }
+    
     UIViewController *parentViewController = self.parentViewController;
     
-    while (![parentViewController isKindOfClass:[CTSplitViewController class]]) {
+    while (parentViewController && ![parentViewController isKindOfClass:[CTSplitViewController class]]) {
         parentViewController = parentViewController.parentViewController;
     }
     
