For LinkedStoryboardModalSegue, show the dest from the source. naviga…

…tionController was nil.
qblu · Sep 15, 2015 · f27a285 · f27a285
1 parent 89e21c8
commit f27a285
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/LinkedStoryboardSegue/LinkedStoryboardModalSegue.swift b/LinkedStoryboardSegue/LinkedStoryboardModalSegue.swift
@@ -12,8 +12,7 @@ public class LinkedStoryboardModalSegue : LinkedStoryboardSegue {
         // gather our view controllers
         let source = self.sourceViewController 
         let destination = self.destinationViewController 
-        // Since this is a moda, a UINavigationController should be ok, not fiing like in the baseClass
-        // push it real good...
-        source.navigationController?.presentViewController(destination, animated:true, completion:nil)
+        // Since this is a modal, a UINavigationController should be ok, not fiing like in the baseClass
+        source.showViewController(destination, sender: self)
     }
 }
diff --git a/LinkedStoryboardSegue/LinkedStoryboardSegue.swift b/LinkedStoryboardSegue/LinkedStoryboardSegue.swift
@@ -76,7 +76,11 @@ public class LinkedStoryboardSegue : UIStoryboardSegue{
         // fix the destination should it be a UINavigationController (that's no good in a push)
         destination = fixDestinationViewControllerForNavigationRootControllers(destination)
         // push it real good...
-        source.navigationController?.pushViewController(destination, animated:true)
+        guard let navigationController = source.navigationController else {
+            print("LinkedStoryboardSegue.perform(): Source \(source) has no navigationController")
+            return
+        }
+        navigationController.pushViewController(destination, animated:true)
     }