Merge pull request #942 from OpenShot/fix-null-nodes-json

Ignore NULL nodes in JSON arrays (clips, effects).
OpenShot · Oct 7, 2023 · 2034f45 · 2034f45
2 parents 95eccaf + 4af8092
commit 2034f45
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/src/Clip.cpp b/src/Clip.cpp
@@ -1040,6 +1040,11 @@ void Clip::SetJsonValue(const Json::Value root) {
 
 		// loop through effects
 		for (const auto existing_effect : root["effects"]) {
+			// Skip NULL nodes
+			if (existing_effect.isNull()) {
+				continue;
+			}
+
 			// Create Effect
 			EffectBase *e = NULL;
 			if (!existing_effect["type"].isNull()) {

diff --git a/src/Timeline.cpp b/src/Timeline.cpp
@@ -1193,6 +1193,11 @@ void Timeline::SetJsonValue(const Json::Value root) {
 
 		// loop through clips
 		for (const Json::Value existing_clip : root["clips"]) {
+			// Skip NULL nodes
+			if (existing_clip.isNull()) {
+				continue;
+			}
+
 			// Create Clip
 			Clip *c = new Clip();
 
@@ -1220,6 +1225,11 @@ void Timeline::SetJsonValue(const Json::Value root) {
 
 		// loop through effects
 		for (const Json::Value existing_effect :root["effects"]) {
+			// Skip NULL nodes
+			if (existing_effect.isNull()) {
+				continue;
+			}
+
 			// Create Effect
 			EffectBase *e = NULL;