libgui|Tests: DisplayMode init and shutdown done by GuiApp

skyjake · Sep 1, 2019 · baba7b7 · baba7b7
1 parent 1a53544
commit baba7b7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/doomsday/libs/gui/src/displaymode.cpp b/doomsday/libs/gui/src/displaymode.cpp
@@ -197,6 +197,7 @@ static void assertDisplayModeHasBeenDeinitialized()
 
 int DisplayMode_Init(void)
 {
+    DE_ASSERT(!inited); // don't redo it
     if (inited) return true;
 
     captured = false;

diff --git a/doomsday/libs/gui/src/guiapp.cpp b/doomsday/libs/gui/src/guiapp.cpp
@@ -23,6 +23,7 @@
 
 #include <de/CommandLine>
 #include <de/Config>
+#include <de/DisplayMode>
 #include <de/EventLoop>
 #include <de/FileSystem>
 #include <de/Log>
@@ -54,6 +55,7 @@ DE_PIMPL(GuiApp)
 
     ~Impl()
     {
+        DisplayMode_Shutdown();
         SDL_Quit();
     }
 
@@ -191,6 +193,7 @@ void GuiApp::initSubsystems(SubsystemInitFlags subsystemInitFlags)
     // Apply the overall UI scale factor.
     d->dpiFactor *= config().getf("ui.scaleFactor", 1.f);
 
+    DisplayMode_Init();
     scriptSystem().nativeModule("DisplayMode").set("DPI_FACTOR", d->dpiFactor);
 }
 

diff --git a/doomsday/tests/test_appfw/src/testapp.cpp b/doomsday/tests/test_appfw/src/testapp.cpp
@@ -19,7 +19,6 @@
 #include "testapp.h"
 #include "appwindowsystem.h"
 
-#include <de/DisplayMode>
 #include <de/FileSystem>
 #include <de/ScriptSystem>
 
@@ -36,8 +35,6 @@ DE_PIMPL(TestApp)
     {
         // Windows will be closed; OpenGL context will be gone.
         self().glDeinit();
-
-        DisplayMode_Shutdown();
     }
 
     void loadAllShaders()
@@ -63,7 +60,6 @@ TestApp::TestApp(const StringList &args)
 
 void TestApp::initialize()
 {
-    DisplayMode_Init();
     addInitPackage("net.dengine.test.appfw");
     initSubsystems(App::DisablePlugins);