#5911: Downgrade GUI loader to use the ThreadedDefLoader base, since …

…it doesn't immediately parse the decl
codereader · Mar 2, 2022 · 4f90626 · 4f90626
1 parent 170eda7
commit 4f90626
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/plugins/dm.gui/gui/GuiManager.cpp b/plugins/dm.gui/gui/GuiManager.cpp
@@ -11,7 +11,7 @@ namespace gui
 {
 
 GuiManager::GuiManager() :
-    _guiLoader(GUI_DIR, GUI_EXT, std::bind(&GuiManager::findGuis, this))
+    _guiLoader(std::bind(&GuiManager::findGuis, this))
 {}
 
 void GuiManager::registerGui(const std::string& guiPath)

diff --git a/plugins/dm.gui/gui/GuiManager.h b/plugins/dm.gui/gui/GuiManager.h
@@ -5,7 +5,7 @@
 #include <map>
 #include "ifilesystem.h"
 #include "string/string.h"
-#include "parser/ThreadedDeclParser.h"
+#include "ThreadedDefLoader.h"
 
 namespace gui
 {
@@ -50,7 +50,7 @@ class GuiManager :
 	typedef std::map<std::string, GuiInfo> GuiInfoMap;
 	GuiInfoMap _guis;
 
-    parser::ThreadedDeclParser<void> _guiLoader;
+    util::ThreadedDefLoader<void> _guiLoader;
 
 	// A List of all the errors occuring lastly.
 	StringList _errorList;