Removing current_screen which caused problems.

lib/ProMotion/screen_helpers/screen_navigation.rb

@@ -69,7 +69,6 @@ module ProMotion
         else
           self.parent_screen.send(:on_return)
         end
-        ProMotion::Screen.current_screen = self.parent_screen
       end
     end
 

lib/ProMotion/screens/_screen_module.rb

@@ -105,13 +105,11 @@ module ProMotion
     end
 
     def view_will_appear(animated)
-      # ProMotion::Screen.current_screen = self
       self.will_appear
     end
     def will_appear; end
 
     def view_did_appear(animated)
-      # ProMotion::Screen.current_screen = self
       self.on_appear
     end
     def on_appear; end
@@ -122,7 +120,6 @@ module ProMotion
     def will_disappear; end
 
     def view_did_disappear(animated)
-      # ProMotion::Screen.current_screen = self.parent_screen if self.parent_screen
       self.on_disappear
     end
     def on_disappear; end
@@ -216,14 +213,6 @@ module ProMotion
         @debug_mode = v
       end
 
-      def current_screen=(s)
-        @current_screen = s
-      end
-
-      def current_screen
-        @current_screen
-      end
-
       def title(t)
         @title = t
       end
@@ -239,4 +228,4 @@ module ProMotion
       base.extend(ClassMethods)
     end
   end
-end
+end

lib/ProMotion/screens/screen.rb

@@ -4,4 +4,4 @@ module ProMotion
     # Just make sure to implement the Obj-C methods in cocoatouch/ViewController.rb.
     include ProMotion::ScreenModule
   end
-end
+end