lib/ProMotion/screen_helpers/screen_navigation.rb in ProMotion-0.6.2 vs lib/ProMotion/screen_helpers/screen_navigation.rb in ProMotion-0.6.3

@@ -27,11 +27,11 @@
 
       elsif self.navigation_controller
         push_view_controller screen
 
       else
-        open_root_screen screen
+        open_root_screen screen.pm_main_controller
 
       end
 
     end
     alias :open :open_screen
@@ -115,12 +115,10 @@
         screen.tab_bar ||= self.tab_bar if screen.respond_to?("tab_bar=")
       end
     end
 
     def present_modal_view_controller(screen, animated)
-      vc = screen
-      vc = screen.main_controller if screen.respond_to?(:main_controller)
-      self.presentModalViewController(vc, animated:animated)
+      self.presentModalViewController(screen.pm_main_controller, animated:animated)
     end
 
     def present_view_controller_in_tab_bar_controller(screen, tab_name)
       vc = open_tab tab_name
       if vc