From da6e55f09faa0759c408315fbac3cd956953c7e9 Mon Sep 17 00:00:00 2001 From: Mikhail Swift Date: Sun, 26 Feb 2017 17:13:50 -0500 Subject: [PATCH] Used same error message elsewhere, fixed null check --- WSRequestHandler.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/WSRequestHandler.cpp b/WSRequestHandler.cpp index e2976a53..b7d6c27d 100644 --- a/WSRequestHandler.cpp +++ b/WSRequestHandler.cpp @@ -264,15 +264,15 @@ void WSRequestHandler::HandleSetSourceRender(WSRequestHandler *owner) obs_source_t* scene; const char *sceneName = obs_data_get_string(owner->_requestData, "scene-name"); - if (sceneName != NULL) { - scene = obs_get_source_by_name(sceneName); + if (!sceneName || !strlen(sceneName)) { + scene = obs_frontend_get_current_scene(); } else { - scene = obs_frontend_get_current_scene(); + scene = obs_get_source_by_name(sceneName); } if (scene == NULL) { - owner->SendErrorResponse("specified scene doesn't exist"); + owner->SendErrorResponse("requested scene doesn't exist"); return; }