#6151: Prevent feedback loops when synchronising the media browser se…

…lection to the shader clipboard
codereader · Nov 5, 2022 · 5cb3fb3 · 5cb3fb3
1 parent 18dca55
commit 5cb3fb3
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/radiant/ui/mediabrowser/MediaBrowser.cpp b/radiant/ui/mediabrowser/MediaBrowser.cpp
@@ -98,6 +98,8 @@ void MediaBrowser::onIdle()
 
     if (!_queuedSelection.empty())
     {
+        util::ScopedBoolLock lock(_blockShaderClipboardUpdates);
+
         setSelection(_queuedSelection);
         _queuedSelection.clear();
     }
@@ -180,17 +182,31 @@ void MediaBrowser::onMaterialDefsUnloaded()
 
 void MediaBrowser::_onTreeViewSelectionChanged(wxDataViewEvent& ev)
 {
-    util::ScopedBoolLock lock(_blockShaderClipboardUpdates);
-
     // Update the preview if a texture is selected
     if (!_treeView->IsDirectorySelected())
     {
         _preview->SetPreviewDeclName(getSelection());
-        GlobalShaderClipboard().setSourceShader(getSelection());
     }
     else
     {
         _preview->ClearPreview();
+    }
+
+    sendSelectionToShaderClipboard();
+}
+
+void MediaBrowser::sendSelectionToShaderClipboard()
+{
+    if (_blockShaderClipboardUpdates) return;
+
+    util::ScopedBoolLock lock(_blockShaderClipboardUpdates);
+
+    if (!_treeView->IsDirectorySelected())
+    {
+        GlobalShaderClipboard().setSourceShader(getSelection());
+    }
+    else
+    {
         // Nothing selected, clear the clipboard
         GlobalShaderClipboard().clear();
     }

diff --git a/radiant/ui/mediabrowser/MediaBrowser.h b/radiant/ui/mediabrowser/MediaBrowser.h
@@ -89,6 +89,7 @@ class MediaBrowser :
     void focusMaterial(FocusMaterialRequest& request);
 
 	void onShaderClipboardSourceChanged();
+	void sendSelectionToShaderClipboard();
 };
 
 }