X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2FApplication.cpp;h=ac95ed0a26f69287d24f69518acd3ef001f4cdaf;hb=a01c2f05b5a6493d7fe097eb15e5337a095992ae;hp=819882e7251f43e66b7ed77311f97c498e74d456;hpb=6d080d21d8055df9962296863b4c0954bc81410b;p=l2e.git

diff --git a/src/app/Application.cpp b/src/app/Application.cpp
index 819882e..ac95ed0 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() {
@@ -121,7 +121,7 @@ void Application::Loop() {
 	Uint32 now(SDL_GetTicks());
 	Uint32 deltaT(now - last);
 	GlobalTimers().Update(deltaT);
-	if (deltaT > 34) deltaT = 34;
+	if (deltaT > 30) deltaT = 30;
 
 	if (CurrentState()) {
 		CurrentState()->GraphicsTimers().Update(deltaT);
@@ -159,7 +159,7 @@ void Application::HandleEvents() {
 				break;
 		}
 	}
-	CurrentState()->HandleEvents(input);
+	if (CurrentState()) CurrentState()->HandleEvents(input);
 }
 
 void Application::UpdateWorld(Uint32 deltaT) {