Mirrored_Repos/obs-websocket
1
0
Fork 0
mirror of https://github.com/Palakis/obs-websocket.git synced 2024-08-30 18:12:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

GetCurrentScene bugfix : several successive requests could cause a crash

Browse Source
This commit is contained in:
Stéphane Lepin 2016-11-19 17:26:25 +01:00
parent c840a89960
commit 12933486c9
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
WSRequestHandler.cpp
View File

@ -196,13 +196,16 @@ void WSRequestHandler::HandleGetCurrentScene(WSRequestHandler *owner) {
obs_source_t *source = obs_frontend_get_current_scene(); obs_source_t *source = obs_frontend_get_current_scene();
const char *name = obs_source_get_name(source); const char *name = obs_source_get_name(source);
obs_data_array_t *scene_items = Utils::GetSceneItems(source);
obs_data_t *data = obs_data_create(); obs_data_t *data = obs_data_create();
obs_data_set_string(data, "name", name); obs_data_set_string(data, "name", name);
obs_data_set_array(data, "sources", Utils::GetSceneItems(source)); obs_data_set_array(data, "sources", scene_items);
owner->SendOKResponse(data); owner->SendOKResponse(data);
obs_data_release(data); obs_data_release(data);
obs_source_release(source); obs_data_array_release(scene_items);
//obs_source_release(source); // causes a source destroy sometimes
} }
void WSRequestHandler::HandleGetSceneList(WSRequestHandler *owner) { void WSRequestHandler::HandleGetSceneList(WSRequestHandler *owner) {