mirror/obs-studio
0
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 04:42:18 +02:00
Code

UI: Stop locking filter mutex while loading properties

Browse Source 
Reordering the filters makes the filter mutex of the source locked
while loading a new the properties of a filter which may require other
locks. By loading the properties of the filter on a QueuedConnection
we make sure the filter mutex is cleared when that happens.
This commit is contained in:
Exeldro 2022-01-08 14:32:35 +01:00 committed by Jim
parent bcb04bb800
commit ae4797f8cc
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/properties-view.cpp
View File

@ -188,7 +188,8 @@ OBSPropertiesView::OBSPropertiesView(OBSData settings_, void *obj_,
minSize(minSize_) minSize(minSize_)
{ {
setFrameShape(QFrame::NoFrame); setFrameShape(QFrame::NoFrame);
ReloadProperties(); QMetaObject::invokeMethod(this, "ReloadProperties",
Qt::QueuedConnection);
} }
OBSPropertiesView::OBSPropertiesView(OBSData settings_, const char *type_, OBSPropertiesView::OBSPropertiesView(OBSData settings_, const char *type_,
@ -202,7 +203,8 @@ OBSPropertiesView::OBSPropertiesView(OBSData settings_, const char *type_,
minSize(minSize_) minSize(minSize_)
{ {
setFrameShape(QFrame::NoFrame); setFrameShape(QFrame::NoFrame);
ReloadProperties(); QMetaObject::invokeMethod(this, "ReloadProperties",
Qt::QueuedConnection);
} }
void OBSPropertiesView::resizeEvent(QResizeEvent *event) void OBSPropertiesView::resizeEvent(QResizeEvent *event)