jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Lock graphics before trying to remove a scene item 

Prevents another deadlock if removing the scene item triggers source
cleanup of a source with graphics resources
master
Palana 2014-01-29 22:54:05 +01:00
parent 2fa208adfb
commit 31ceec04ce
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
obs/window-basic-main.cpp
View File

@ -519,6 +519,7 @@ void OBSBasic::on_actionRemoveSource_triggered()
if (!scene)
return;
gs_entercontext(obs_graphics());
obs_scene_addref(scene);
QVariant userData = sel->data(Qt::UserRole);
@ -526,6 +527,7 @@ void OBSBasic::on_actionRemoveSource_triggered()
obs_sceneitem_destroy(scene, item);
obs_scene_release(scene);
gs_leavecontext();
}
void OBSBasic::on_actionSourceProperties_triggered()