UI|Client: Halt UI updates when application is shutting down

skyjake · Jun 19, 2017 · 94bbf61 · 94bbf61
1 parent 174dcab
commit 94bbf61
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/doomsday/apps/client/include/ui/clientrootwidget.h b/doomsday/apps/client/include/ui/clientrootwidget.h
@@ -34,9 +34,11 @@ class ClientRootWidget : public de::GuiRootWidget
 
     ClientWindow &window();
 
-    void addOnTop(de::GuiWidget *widget);
-    void dispatchLatestMousePosition();
-    void handleEventAsFallback(de::Event const &event);
+    void update() override;
+
+    void addOnTop(de::GuiWidget *widget) override;
+    void dispatchLatestMousePosition() override;
+    void handleEventAsFallback(de::Event const &event) override;
 };
 
 #endif // DENG_CLIENTROOTWIDGET_H
diff --git a/doomsday/apps/client/src/ui/clientrootwidget.cpp b/doomsday/apps/client/src/ui/clientrootwidget.cpp
@@ -33,6 +33,14 @@ ClientWindow &ClientRootWidget::window()
     return GuiRootWidget::window().as<ClientWindow>();
 }
 
+void ClientRootWidget::update()
+{
+    if (!DoomsdayApp::app().isShuttingDown())
+    {
+        GuiRootWidget::update();
+    }
+}
+
 void ClientRootWidget::addOnTop(GuiWidget *widget)
 {
     // The window knows what is the correct top to add to.

diff --git a/doomsday/apps/client/src/ui/widgets/gamewidget.cpp b/doomsday/apps/client/src/ui/widgets/gamewidget.cpp
@@ -281,7 +281,7 @@ void GameWidget::update()
 {
     GuiWidget::update();
 
-    if (DoomsdayApp::app().isShuttingDown() || isDisabled() || BusyMode_Active()) return;
+    if (isDisabled() || BusyMode_Active()) return;
 
     // We may be performing GL operations.
     ClientWindow::main().glActivate();