X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fcore%2Fapp.rs;h=d440eb3759c59db429c229dabe216e36944830b0;hb=7b724ff393ea83b7a2d43fbfa93199d0c395af92;hp=434f56c53a1273d37e9856acf20bd522e2d4a26d;hpb=1f42d724d84ed1c014ff40ccc91058472391be0c;p=kaka%2Frust-sdl-test.git

diff --git a/src/core/app.rs b/src/core/app.rs
index 434f56c..d440eb3 100644
--- a/src/core/app.rs
+++ b/src/core/app.rs
@@ -141,7 +141,7 @@ impl App {
     pub fn start(&mut self) {
         let mut last_time = Instant::now();
 
-	self.states[0].enter(&mut self.ctrl_man);
+	self.states[0].enter(&self.ctrl_man);
 
         loop {
 	    if let Some(change) = self.handle_events() {
@@ -248,7 +248,9 @@ impl App {
                 }
                 _ => {
 		    if let Some(state) = self.states.last_mut() {
-			return state.handle_event(event)
+			if let Some(change) = state.handle_event(event) {
+			    return Some(change);
+			}
 		    } else {
 			return Some(StateChange::Exit)
 		    }