X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2FApplication.cpp;h=c1e4f15311526ec5f767078d5faf30d5d9a72eb5;hb=64c314421a700696260d73395776634dc64fc46c;hp=fc1d3801d4ab6fe65f0ea8af622904e0eb01b194;hpb=bce16ed519add0d5398d504d2554395c43c74571;p=l2e.git

diff --git a/src/app/Application.cpp b/src/app/Application.cpp
index fc1d380..c1e4f15 100644
--- a/src/app/Application.cpp
+++ b/src/app/Application.cpp
@@ -28,7 +28,7 @@ Application::~Application() {
 
 
 State *Application::CurrentState() {
-	return states.top();
+	return states.empty() ? 0 : states.top();
 }
 
 void Application::UpdateState() {
@@ -159,7 +159,7 @@ void Application::HandleEvents() {
 				break;
 		}
 	}
-	CurrentState()->HandleInput(input);
+	CurrentState()->HandleEvents(input);
 }
 
 void Application::UpdateWorld(Uint32 deltaT) {