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

Used same error message elsewhere, fixed null check

Browse Source
This commit is contained in:
Mikhail Swift 2017-02-26 17:13:50 -05:00
parent d277e2788a
commit da6e55f09f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
WSRequestHandler.cpp
View File

@ -264,15 +264,15 @@ void WSRequestHandler::HandleSetSourceRender(WSRequestHandler *owner)
obs_source_t* scene; obs_source_t* scene;
const char *sceneName = obs_data_get_string(owner->_requestData, "scene-name"); const char *sceneName = obs_data_get_string(owner->_requestData, "scene-name");
if (sceneName != NULL) { if (!sceneName || !strlen(sceneName)) {
scene = obs_get_source_by_name(sceneName); scene = obs_frontend_get_current_scene();
} }
else { else {
scene = obs_frontend_get_current_scene(); scene = obs_get_source_by_name(sceneName);
} }
if (scene == NULL) { if (scene == NULL) {
owner->SendErrorResponse("specified scene doesn't exist"); owner->SendErrorResponse("requested scene doesn't exist");
return; return;
} }