1berry/obs-studio
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UI: Handle (de)select scene items queued

Browse Source 
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
This commit is contained in:
Exeldro 2020-11-25 13:05:31 +01:00 committed by Jim
parent 3a1af9cb8a
commit d68484e7b7
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
UI/source-tree.cpp
View File

@ -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 *) {