Fix #4966: Reload Models option in Create Model dialog window doesn't…

… update the model
codereader · Mar 10, 2019 · 4f9f5b3 · 4f9f5b3
1 parent 06e6d35
commit 4f9f5b3
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 13 deletions.
diff --git a/radiant/map/algorithm/Export.cpp b/radiant/map/algorithm/Export.cpp
@@ -127,7 +127,7 @@ void exportSelectedAsModel(const ModelExportOptions& options)
 		Node_getEntity(modelNode)->setKeyValue("model", relativeModelPath);
 
 		// It's possible that the export overwrote a model we're already using in this map, refresh it
-		refreshSelectedModels();
+		refreshSelectedModels(false);
 	}
 	catch (selection::algorithm::EntityCreationException&)
 	{

diff --git a/radiant/map/algorithm/Models.cpp b/radiant/map/algorithm/Models.cpp
@@ -88,10 +88,15 @@ class ModelRefreshWalker :
 	}
 };
 
-void refreshModels()
+void refreshModels(bool blockScreenUpdates)
 {
-	// Disable screen updates for the scope of this function
-	ui::ScreenUpdateBlocker blocker(_("Processing..."), _("Reloading Models"));
+	std::unique_ptr<ui::ScreenUpdateBlocker> blocker;
+
+	if (blockScreenUpdates)
+	{
+		// Disable screen updates for the scope of this function
+		blocker.reset(new ui::ScreenUpdateBlocker(_("Processing..."), _("Reloading Models")));
+	}
 
 	// Clear the model cache
 	GlobalModelCache().clear();
@@ -104,10 +109,15 @@ void refreshModels()
 	GlobalModelCache().signal_modelsReloaded().emit();
 }
 
-void refreshSelectedModels()
+void refreshSelectedModels(bool blockScreenUpdates)
 {
-	// Disable screen updates for the scope of this function
-	ui::ScreenUpdateBlocker blocker(_("Processing..."), _("Reloading Models"));
+	std::unique_ptr<ui::ScreenUpdateBlocker> blocker;
+
+	if (blockScreenUpdates)
+	{
+		// Disable screen updates for the scope of this function
+		blocker.reset(new ui::ScreenUpdateBlocker(_("Processing..."), _("Reloading Models")));
+	}
 
 	// Find all models in the current selection
 	ModelFinder walker;

diff --git a/radiant/map/algorithm/Models.h b/radiant/map/algorithm/Models.h
@@ -7,10 +7,10 @@ namespace algorithm
 {
 
 // This reloads all models in the map
-void refreshModels();
+void refreshModels(bool blockScreenUpdates);
 
 // This reloads all selected models in the map
-void refreshSelectedModels();
+void refreshSelectedModels(bool blockScreenUpdates);
 
 }
 

diff --git a/radiant/model/ModelCache.cpp b/radiant/model/ModelCache.cpp
@@ -205,12 +205,12 @@ void ModelCache::shutdownModule()
 
 void ModelCache::refreshModels(const cmd::ArgumentList& args)
 {
-	map::algorithm::refreshModels();
+	map::algorithm::refreshModels(true);
 }
 
 void ModelCache::refreshSelectedModels(const cmd::ArgumentList& args)
 {
-	map::algorithm::refreshSelectedModels();
+	map::algorithm::refreshSelectedModels(true);
 }
 
 // The static module

diff --git a/radiant/ui/modelselector/ModelSelector.cpp b/radiant/ui/modelselector/ModelSelector.cpp
@@ -27,6 +27,8 @@
 
 #include <functional>
 
+#include "map/algorithm/Models.h"
+
 namespace ui
 {
 
@@ -484,8 +486,8 @@ void ModelSelector::onReloadModels(wxCommandEvent& ev)
 	// Remember the selected model before reloading
 	_preselectedModel = getSelectedValue(_columns.vfspath);
 
-	_populated = false;
-	populateModels();
+	// This will fire the models reloaded signal after some time
+	map::algorithm::refreshModels(false);
 }
 
 void ModelSelector::onReloadSkins(wxCommandEvent& ev)