4aiman/obs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UI: Fix possible crash due to UI property access from graphics thread

Browse source 
Selection state can change by main thread while UI thread (which
calls DrawSpacingHelpers) tries to evaluate the amount of selected
items. Get amount of selected items by enumerating over the scene data
instead (which stays within the graphics thread).
This commit is contained in:
PatTheMav 2022-10-11 17:31:24 +02:00 • committed by Jim
commit e2db9b7f70
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
UI/window-basic-preview.cpp
View file

@ -2453,7 +2453,12 @@ void OBSBasicPreview::DrawSpacingHelpers()
OBSBasic *main = OBSBasic::Get();
if (main->ui->sources->selectionModel()->selectedIndexes().count() > 1)
vec2 s;
SceneFindBoxData data(s, s);
obs_scene_enum_items(main->GetCurrentScene(), FindSelected, &data);
if (data.sceneItems.size() > 1)
return;
OBSSceneItem item = main->GetCurrentSceneItem();