UI: Handle (de)select scene items queued

The (de)select signal can come from a obs_scene_enum_items which locks the scene. The Qt::QueuedConnection makes sure the (de)select is handled outside of that lock. Fixes the deadlock from #3673
obsproject · Dec 12, 2020 · d68484e · d68484e
1 parent 3a1af9c
commit d68484e
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/UI/source-tree.cpp b/UI/source-tree.cpp
@@ -227,7 +227,8 @@ void SourceTreeItem::ReconnectSignals()
 			(obs_sceneitem_t *)calldata_ptr(cd, "item");
 
 		if (curItem == this_->sceneitem)
-			QMetaObject::invokeMethod(this_, "Select");
+			QMetaObject::invokeMethod(this_, "Select",
+						  Qt::QueuedConnection);
 	};
 
 	auto itemDeselect = [](void *data, calldata_t *cd) {
@@ -237,7 +238,8 @@ void SourceTreeItem::ReconnectSignals()
 			(obs_sceneitem_t *)calldata_ptr(cd, "item");
 
 		if (curItem == this_->sceneitem)
-			QMetaObject::invokeMethod(this_, "Deselect");
+			QMetaObject::invokeMethod(this_, "Deselect",
+						  Qt::QueuedConnection);
 	};
 
 	auto reorderGroup = [](void *data, calldata_t *) {