X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2FApplication.cpp;h=4c8c5747ff71dd5620fe2a6d26c96fdf0efc4e03;hb=aa1a197e532673f0c4d33dee5bed27298c050d38;hp=6e46203aa94184de00c55d90ff41025b7433d12d;hpb=8456b7dac2051bfd2b507a39854c1428eb4d91cd;p=l2e.git

diff --git a/src/app/Application.cpp b/src/app/Application.cpp
index 6e46203..4c8c574 100644
--- a/src/app/Application.cpp
+++ b/src/app/Application.cpp
@@ -106,7 +106,10 @@ void Application::Quit() {
 
 void Application::PopAllStates() {
 	while (!states.empty()) {
-		RealPopState();
+		states.top()->PauseState(*this, screen->Screen());
+		states.top()->ExitState(*this, screen->Screen());
+		delete states.top();
+		states.pop();
 	}
 }
 
@@ -159,7 +162,7 @@ void Application::HandleEvents() {
 				break;
 		}
 	}
-	CurrentState()->HandleEvents(input);
+	if (CurrentState()) CurrentState()->HandleEvents(input);
 }
 
 void Application::UpdateWorld(Uint32 deltaT) {