#5337: Add loopback guard to PrefabSelector::handleSelectionChange. I…

…t doesn't occur anymore after the changes to MapFileProgressHandler, but it still provides additional protection.

radiant/ui/MapFileProgressHandler.cpp

@@ -53,6 +53,11 @@ void MapFileProgressHandler::dispatchWithLockAndCatch(const std::function<void()
 
 void MapFileProgressHandler::handleFileOperation(map::FileOperation& msg)
 {
+	if (registry::getValue<bool>(RKEY_MAP_SUPPRESS_LOAD_STATUS_DIALOG))
+	{
+		return; // no progress dialog enabled
+	}
+
 	auto lock = std::make_unique< std::lock_guard<std::mutex> >(_lock);
 
 	// A previous _blocker update might indicate a cancel operation, propagate this info
@@ -75,8 +80,7 @@ void MapFileProgressHandler::handleFileOperation(map::FileOperation& msg)
 			dispatchWithLockAndCatch([title, this]()
 			{
 				// Level might have been decreased in the meantime, check it
-				if (_level > 0 && GlobalMainFrame().isActiveApp() && 
-					!registry::getValue<bool>(RKEY_MAP_SUPPRESS_LOAD_STATUS_DIALOG))
+				if (_level > 0 && GlobalMainFrame().isActiveApp())
 				{
 					_blocker.reset(new ScreenUpdateBlocker(title, _("Processing..."), true));
 				}
@@ -129,7 +133,7 @@ void MapFileProgressHandler::handleFileOperation(map::FileOperation& msg)
 	// Release the lock, and give the UI a chance to process
 	lock.reset();
 
-	wxTheApp->Yield();
+	wxTheApp->ProcessPendingEvents();
 }
 
 }

radiant/ui/mainframe/ScreenUpdateBlocker.cpp

@@ -22,9 +22,6 @@ ScreenUpdateBlocker::ScreenUpdateBlocker(const std::string& title, const std::st
 		showModalProgressDialog();
 	}
 
-	// Process pending events to fully show the dialog
-	wxTheApp->Yield(true);
-
 	// Register for the "is-active" changed event, to display this dialog
 	// as soon as Radiant is getting the focus again
 	GlobalMainFrame().getWxTopLevelWindow()->Bind(wxEVT_SET_FOCUS, &ScreenUpdateBlocker::onMainWindowFocus, this);
@@ -41,6 +38,9 @@ void ScreenUpdateBlocker::showModalProgressDialog()
 
 	// Eat all window events
 	_disabler.reset(new wxWindowDisabler(_dialog));
+
+	// Process pending events to fully show the dialog
+	wxTheApp->Yield(true);
 }
 
 ScreenUpdateBlocker::~ScreenUpdateBlocker()

radiant/ui/prefabselector/PrefabSelector.cpp

@@ -29,6 +29,7 @@
 
 #include "string/trim.h"
 #include "string/case_conv.h"
+#include "util/ScopedBoolLock.h"
 #include <functional>
 
 namespace ui
@@ -63,7 +64,8 @@ PrefabSelector::PrefabSelector() :
     _useRecentPath(nullptr),
     _recentPathSelector(nullptr),
     _customPath(nullptr),
-	_insertAsGroupBox(nullptr)
+	_insertAsGroupBox(nullptr),
+	_handlingSelectionChange(false)
 {
 	SetSizer(new wxBoxSizer(wxVERTICAL));
 
@@ -466,7 +468,14 @@ void PrefabSelector::clearPreview()
 
 void PrefabSelector::handleSelectionChange()
 {
-    wxDataViewItem item = _treeView->GetSelection();
+	if (_handlingSelectionChange)
+	{
+		return;
+	}
+
+	util::ScopedBoolLock lock(_handlingSelectionChange);
+
+	wxDataViewItem item = _treeView->GetSelection();
 
     if (!item.IsOk())
     {

radiant/ui/prefabselector/PrefabSelector.h

@@ -91,6 +91,8 @@ class PrefabSelector :
 
     std::list<std::string> _recentPaths;
 
+	bool _handlingSelectionChange;
+
 private:
 	// Private constructor, creates widgets
 	PrefabSelector();