#5527: Move static wx initialisation code to RadiantApp, add the corr…

…esponding tear down calls rather than leaving the app without cleanup.
codereader · Feb 7, 2021 · 11cd8c2 · 11cd8c2
1 parent 7a7207f
commit 11cd8c2
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 19 deletions.
diff --git a/radiant/RadiantApp.cpp b/radiant/RadiantApp.cpp
@@ -14,6 +14,7 @@
 #include <wx/wxprec.h>
 #include <wx/event.h>
 #include <wx/cmdline.h>
+#include <wx/xrc/xmlres.h>
 #include <sigc++/functors/mem_fun.h>
 
 #ifndef __linux__
@@ -60,10 +61,6 @@ bool RadiantApp::OnInit()
     g_log_set_writer_func(log_black_hole, nullptr, nullptr);
 #endif
 
-	// Stop wx's unhelpful debug messages about missing keyboard accel
-	// strings from cluttering up the console
-	wxLog::SetLogLevel(wxLOG_Warning);
-
 	// Initialise the context (application path / settings path, is
 	// OS-specific)
 	_context.initialise(wxApp::argc, wxApp::argv);
@@ -102,10 +99,8 @@ bool RadiantApp::OnInit()
 	setlocale(LC_NUMERIC, "C");
 	setlocale(LC_TIME, "C");
 
-	wxInitAllImageHandlers();
-
-    // Register the local art provider
-    _bitmapArtProvider = std::make_unique<wxutil::LocalBitmapArtProvider>(_context.getBitmapsPath());
+    // Set up art provider, logging, XRC file handlers
+    initWxWidgets();
 
 	// Register to the start up signal
 	Bind(EV_RadiantStartup, &RadiantApp::onStartupEvent, this);
@@ -115,6 +110,32 @@ bool RadiantApp::OnInit()
 	return true;
 }
 
+void RadiantApp::initWxWidgets()
+{
+    // Stop wx's unhelpful debug messages about missing keyboard accel
+    // strings from cluttering up the console
+    wxLog::SetLogLevel(wxLOG_Warning);
+
+    wxFileSystem::AddHandler(new wxLocalFSHandler);
+    wxXmlResource::Get()->InitAllHandlers();
+
+    // Our XRC resource files are stored in the ui/ folder.
+    wxXmlResource::Get()->Load(_context.getRuntimeDataPath() + "ui/*.xrc");
+
+    wxInitAllImageHandlers();
+
+    // Register the local art provider
+    _bitmapArtProvider = std::make_unique<wxutil::LocalBitmapArtProvider>(_context.getBitmapsPath());
+}
+
+void RadiantApp::cleanupWxWidgets()
+{
+    _bitmapArtProvider.reset();
+    wxImage::CleanUpHandlers();
+    wxXmlResource::Get()->ClearHandlers();
+    wxFileSystem::CleanUpHandlers();
+}
+
 int RadiantApp::OnExit()
 {
 	// Issue a shutdown() call to all the modules
@@ -128,7 +149,7 @@ int RadiantApp::OnExit()
 
 	_coreModule.reset();
 
-    _bitmapArtProvider.reset();
+    cleanupWxWidgets();
 
 	return wxApp::OnExit();
 }

diff --git a/radiant/RadiantApp.h b/radiant/RadiantApp.h
@@ -41,4 +41,6 @@ class RadiantApp :
 private:
 	void onStartupEvent(wxCommandEvent& ev);
 	void onModulesUnloading();
+    void initWxWidgets();
+    void cleanupWxWidgets();
 };
diff --git a/radiant/uimanager/UIManager.cpp b/radiant/uimanager/UIManager.cpp
@@ -5,8 +5,6 @@
 #include "imainframe.h"
 #include "GroupDialog.h"
 
-#include <wx/xrc/xmlres.h>
-
 namespace ui
 {
 
@@ -22,8 +20,6 @@ IGroupDialog& UIManager::getGroupDialog() {
 void UIManager::clear()
 {
 	_dialogManager.reset();
-
-	wxFileSystem::CleanUpHandlers();
 }
 
 const std::string& UIManager::getName() const
@@ -53,12 +49,6 @@ void UIManager::initialiseModule(const IApplicationContext& ctx)
 	GlobalMainFrame().signal_MainFrameShuttingDown().connect(
         sigc::mem_fun(this, &UIManager::clear)
     );
-
-	wxFileSystem::AddHandler(new wxLocalFSHandler);
-	wxXmlResource::Get()->InitAllHandlers();
-
-	std::string fullPath = ctx.getRuntimeDataPath() + "ui/";
-	wxXmlResource::Get()->Load(fullPath + "*.xrc");
 }
 
 module::StaticModule<UIManager> uiManagerModule;