Fixed|Client: Null pointer access if shutting down too early

The input system may be missing when an error occurs.
skyjake · Jul 7, 2015 · 68823ad · 68823ad
1 parent d1d97dc
commit 68823ad
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/doomsday/apps/client/include/clientapp.h b/doomsday/apps/client/include/clientapp.h
@@ -76,6 +76,7 @@ class ClientApp : public de::BaseGuiApp
     static de::Games &games();
     static de::WorldSystem &worldSystem();
 
+    static bool hasInputSystem();
     static bool hasRenderSystem();
 
 public slots:

diff --git a/doomsday/apps/client/src/clientapp.cpp b/doomsday/apps/client/src/clientapp.cpp
@@ -504,6 +504,11 @@ InputSystem &ClientApp::inputSystem()
     return *a.d->inputSys;
 }
 
+bool ClientApp::hasInputSystem()
+{
+    return ClientApp::app().d->inputSys != nullptr;
+}
+
 RenderSystem &ClientApp::renderSystem()
 {
     ClientApp &a = ClientApp::app();
@@ -513,7 +518,7 @@ RenderSystem &ClientApp::renderSystem()
 
 bool ClientApp::hasRenderSystem()
 {
-    return ClientApp::app().d->rendSys != 0;
+    return ClientApp::app().d->rendSys != nullptr;
 }
 
 ResourceSystem &ClientApp::resourceSystem()

diff --git a/doomsday/apps/client/src/sys_system.cpp b/doomsday/apps/client/src/sys_system.cpp
@@ -134,9 +134,13 @@ void Sys_Shutdown()
     // Let's shut down sound first, so Windows' HD-hogging doesn't jam
     // the MUS player (would produce horrible bursts of notes).
     S_Shutdown();
+
 #ifdef __CLIENT__
     GL_Shutdown();
-    ClientApp::inputSystem().clearEvents();
+    if(ClientApp::hasInputSystem())
+    {
+        ClientApp::inputSystem().clearEvents();
+    }
 #endif
 
     App_ClearGames();