Fix #1292 SceneFactory.fromName return exception on duplicate scene (#…

…1327)
stream-labs · Jul 24, 2023 · 8bf1139 · 8bf1139
1 parent 260df2e
commit 8bf1139
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/obs-studio-client/source/scene.cpp b/obs-studio-client/source/scene.cpp
@@ -225,15 +225,17 @@ Napi::Value osn::Scene::Duplicate(const Napi::CallbackInfo &info)
 	if (!ValidateResponse(info, response))
 		return info.Env().Undefined();
 
-	uint64_t sourceId = response[1].value_union.ui64;
+	const auto sourceId = response[1].value_union.ui64;
 
-	SourceDataInfo *sdi = new SourceDataInfo;
+	auto *const sdi = new SourceDataInfo;
 	sdi->name = name;
 	sdi->obs_sourceId = "scene";
-	sdi->id = response[1].value_union.ui64;
-
+	sdi->id = sourceId;
 	CacheManager<SourceDataInfo *>::getInstance().Store(sourceId, name, sdi);
-	CacheManager<SceneInfo *>::getInstance().Store(sourceId, name, new SceneInfo);
+
+	auto *const si = new SceneInfo;
+	si->id = sourceId;
+	CacheManager<SceneInfo *>::getInstance().Store(sourceId, name, si);
 
 	auto instance = osn::Input::constructor.New({Napi::Number::New(info.Env(), sourceId)});
 

diff --git a/tests/osn-tests/src/test_osn_scene.ts b/tests/osn-tests/src/test_osn_scene.ts
@@ -57,8 +57,6 @@ describe(testName, () => {
     });
 
     it('Duplicate scene', () => {
-        // known bug enable test when fixed
-        return;
         const sceneName = 'duplicate_scene';
 
         // Creating scene