lib/ProMotion/screen/screen_navigation.rb in ProMotion-2.0.0.rc3 vs lib/ProMotion/screen/screen_navigation.rb in ProMotion-2.0.0.rc4

@@ -40,10 +40,11 @@
       args ||= {}
       args = { sender: args } unless args.is_a?(Hash)
       args[:animated] = true unless args.has_key?(:animated)
 
       if self.modal?
+        close_nav_screen args if self.navigationController
         close_modal_screen args
 
       elsif self.navigationController
         close_nav_screen args
         send_on_return(args) # TODO: this would be better implemented in a callback or view_did_disappear.
@@ -142,12 +143,10 @@
         self.parent_screen = args[:to_screen]
         self.navigationController.popToViewController(args[:to_screen], animated: args[:animated])
       else
         self.navigationController.popViewControllerAnimated(args[:animated])
       end
+      self.navigationController = nil
     end
 
   end
 end
-
-
-