Check whether there's an application instance before calling Shutdown().

diff --git a/base/application.cpp b/base/application.cpp
index ea479cbeb8c2b5c865ea4e219ff7c5ad426b6a76..0c75392cac1e50ba3f2c352c44a9faf88d0da2ac 100644 (file)
--- a/base/application.cpp
+++ b/base/application.cpp
@@ -437,7 +437,12 @@ void Application::SigIntHandler(int signum)
 {
        assert(signum == SIGINT);
 
-       Application::GetInstance()->Shutdown();
+       Application::Ptr instance = Application::GetInstance();
+
+       if (!instance)
+               return;
+
+       instance->Shutdown();
 
        struct sigaction sa;
        memset(&sa, 0, sizeof(sa));
@@ -451,7 +456,13 @@ void Application::SigIntHandler(int signum)
  */
 BOOL WINAPI Application::CtrlHandler(DWORD type)
 {
-       Application::GetInstance()->Shutdown();
+       Application::Ptr instance = Application::GetInstance();
+
+       if (!instance)
+               return TRUE;
+
+       instance->GetInstance()->Shutdown();
+
        SetConsoleCtrlHandler(NULL, FALSE);
        return TRUE;
 }