openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-03-02 08:53:52 -08:00
Code Issues Packages Projects Releases Wiki Activity

Ignore NULL nodes in JSON arrays (clips, effects). This can happen sometimes (for an unknown reason), and it currently crashes OpenShot when attempting to Export a video.

Browse Source
This commit is contained in:
Jonathan Thomas
2023-10-07 15:19:36 -05:00
parent 95eccafc85
commit 4af80925b2
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Clip.cpp
View File

@@ -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()) {

10
src/Timeline.cpp
View File

@@ -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;