From 0992f74fad7626138c69a8e2acfed2f5c4501849 Mon Sep 17 00:00:00 2001 From: tt2468 Date: Mon, 27 Dec 2021 19:06:57 -0800 Subject: [PATCH] RequestHandler: Use ValidateScene2 for GetSceneItemId --- src/requesthandler/RequestHandler_SceneItems.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/requesthandler/RequestHandler_SceneItems.cpp b/src/requesthandler/RequestHandler_SceneItems.cpp index 34f1958e..90abd2fc 100644 --- a/src/requesthandler/RequestHandler_SceneItems.cpp +++ b/src/requesthandler/RequestHandler_SceneItems.cpp @@ -102,17 +102,10 @@ RequestResult RequestHandler::GetSceneItemId(const Request& request) { RequestStatus::RequestStatus statusCode; std::string comment; - OBSSourceAutoRelease sceneSource = request.ValidateScene("sceneName", statusCode, comment, OBS_WEBSOCKET_SCENE_FILTER_SCENE_OR_GROUP); - if (!(sceneSource && request.ValidateString("sourceName", statusCode, comment))) + OBSSceneAutoRelease scene = request.ValidateScene2("sceneName", statusCode, comment, OBS_WEBSOCKET_SCENE_FILTER_SCENE_OR_GROUP); + if (!(scene && request.ValidateString("sourceName", statusCode, comment))) return RequestResult::Error(statusCode, comment); - OBSScene scene = obs_scene_from_source(sceneSource); - if (!scene) { - scene = obs_group_from_source(sceneSource); - if (!scene) // This should never happen - return RequestResult::Error(RequestStatus::GenericError, "Somehow the scene was found but the scene object could not be fetched. Please report this to the obs-websocket developers."); - } - std::string sourceName = request.RequestData["sourceName"]; OBSSceneItemAutoRelease item = Utils::Obs::SearchHelper::GetSceneItemByName(scene, sourceName);