Fixed|Cleanup: Crash during application termination

The client shouldn't crash after a fatal error occurs.

doomsday/apps/client/src/clientapp.cpp

@@ -238,7 +238,7 @@ DENG2_PIMPL(ClientApp)
     {
         try
         {
-            ClientWindow::main().glActivate(); // for GL deinit
+            ClientWindow::glActiveMain(); // for GL deinit
 
             LogBuffer::get().removeSink(logAlarm);
 

doomsday/apps/client/src/main_client.cpp

@@ -1,7 +1,7 @@
 /** @file main_client.cpp Client application entrypoint.
  * @ingroup base
  *
- * @authors Copyright © 2012-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
+ * @authors Copyright © 2012-2016 Jaakko Keränen <jaakko.keranen@iki.fi>
  * @authors Copyright © 2013 Daniel Swanson <danij@dengine.net>
  *
  * @par License
@@ -22,15 +22,14 @@
 /**
  * @page mainFlow Engine Control Flow
  *
- * The main Qt application instance is ClientApp, based on de::GuiApp, a slightly
- * modified version of the normal QApplication: it catches stray exceptions and forces a
- * clean shutdown of the application.
+ * The main Qt application instance is ClientApp, based on de::BaseGuiApp.
  *
- * The application's event loop is started as soon as the main window has been created
- * (but not shown yet). After the window appears with a fully functional OpenGL drawing
- * surface, the rest of the engine initialization is completed. This is done via a
- * callback in the Canvas class that gets called when the window actually appears on
- * screen (with empty contents).
+ * The event loop is started after the application has been initialized. Initialization
+ * comprises the creation of subsystems and the main window. As a final step during
+ * initialization, the "bootstrap" script is executed. At this point, the main window is
+ * not visible yet. After the window appears with a fully functional OpenGL drawing
+ * surface, the rest of the engine initialization is completed. This is done via an
+ * observer audience in the de::GLWindow class.
  *
  * The application's refresh loop is controlled by de::Loop. Before each frame, clock
  * time advances and de::Loop's iteration audience is notified. This is observed by

doomsday/apps/client/src/sys_system.cpp

@@ -135,10 +135,12 @@ void Sys_Shutdown()
     Net_Shutdown();
 
 #ifdef __CLIENT__
-    // Let's shut down sound first, so Windows' HD-hogging doesn't jam
-    // the MUS player (would produce horrible bursts of notes).
-    App_AudioSystem().deinitPlayback();
-
+    if (ClientApp::hasAudioSystem())
+    {
+        // Let's shut down sound first, so Windows' HD-hogging doesn't jam
+        // the MUS player (would produce horrible bursts of notes).
+        App_AudioSystem().deinitPlayback();
+    }
     GL_Shutdown();
     if(ClientApp::hasInputSystem())
     {

doomsday/apps/libdoomsday/src/doomsdayapp.cpp

@@ -131,9 +131,11 @@ DENG2_PIMPL(DoomsdayApp)
 
     ~Impl()
     {
-        // Save any changes to the game profiles.
-        gameProfiles.serialize();
-
+        if (initialized)
+        {
+            // Save any changes to the game profiles.
+            gameProfiles.serialize();
+        }
         theDoomsdayApp = nullptr;
     }
 

doomsday/sdk/libappfw/src/baseguiapp.cpp

@@ -132,10 +132,7 @@ BaseGuiApp::BaseGuiApp(int &argc, char **argv)
 
 void BaseGuiApp::glDeinit()
 {
-    if (GLWindow::mainExists())
-    {
-        GLWindow::main().glActivate();
-    }
+    GLWindow::glActiveMain();
 
     d->vr.oculusRift().deinit();
     d->shaders.clear();

doomsday/sdk/libgui/include/de/gui/glwindow.h

@@ -47,7 +47,6 @@ class LIBGUI_PUBLIC GLWindow : public QOpenGLWindow, public Asset
 public:
     typedef Vector2ui Size;
 
-
     /**
      * Notified when the canvas's GL state needs to be initialized. The OpenGL
      * context and drawing surface are not ready before this occurs. This gets
@@ -176,6 +175,7 @@ class LIBGUI_PUBLIC GLWindow : public QOpenGLWindow, public Asset
 public:
     static bool mainExists();
     static GLWindow &main();
+    static void glActiveMain();
     static void setMain(GLWindow *window);
 
 protected:

doomsday/sdk/libgui/src/glwindow.cpp

@@ -497,6 +497,11 @@ GLWindow &GLWindow::main() // static
     return *mainWindow;
 }
 
+void GLWindow::glActiveMain()
+{
+    if (mainExists()) main().glActivate();
+}
+
 void GLWindow::setMain(GLWindow *window) // static
 {
     mainWindow = window;