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

Revert "Request: Minor code cleanup"

Browse Source 
This reverts commit c16669c7b0f73710dce891a7b9fcd4e0b6ed8982.
This commit is contained in:
tt2468 2021-09-02 13:33:20 -07:00
parent c16669c7b0
commit d7f96b6dea
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/requesthandler/rpc/Request.cpp
View File

@ -143,7 +143,7 @@ obs_source_t *Request::ValidateScene(const std::string keyName, RequestStatus::R
std::string sceneName = RequestData[keyName]; std::string sceneName = RequestData[keyName];
OBSSourceAutoRelease ret = obs_get_source_by_name(sceneName.c_str()); obs_source_t *ret = obs_get_source_by_name(sceneName.c_str());
if (!ret) { if (!ret) {
statusCode = RequestStatus::ResourceNotFound; statusCode = RequestStatus::ResourceNotFound;
comment = std::string("No scene was found by the name of `") + sceneName + "`."; comment = std::string("No scene was found by the name of `") + sceneName + "`.";
@ -151,6 +151,7 @@ obs_source_t *Request::ValidateScene(const std::string keyName, RequestStatus::R
} }
if (obs_source_get_type(ret) != OBS_SOURCE_TYPE_SCENE) { if (obs_source_get_type(ret) != OBS_SOURCE_TYPE_SCENE) {
obs_source_release(ret);
statusCode = RequestStatus::InvalidResourceType; statusCode = RequestStatus::InvalidResourceType;
comment = "The specified source is not a scene."; comment = "The specified source is not a scene.";
return nullptr; return nullptr;
@ -158,12 +159,12 @@ obs_source_t *Request::ValidateScene(const std::string keyName, RequestStatus::R
OBSScene scene = obs_scene_from_source(ret); OBSScene scene = obs_scene_from_source(ret);
if (obs_scene_is_group(scene)) { if (obs_scene_is_group(scene)) {
obs_source_release(ret);
statusCode = RequestStatus::InvalidResourceType; statusCode = RequestStatus::InvalidResourceType;
comment = "The specified source is not a scene."; comment = "The specified source is not a scene.";
return nullptr; return nullptr;
} }
obs_source_addref(ret);
return ret; return ret;
} }