Protecting ObjectDetection when no object is found

OpenShot · Apr 8, 2021 · 6b6b6d5 · 6b6b6d5
1 parent c55efd1
commit 6b6b6d5
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/src/TrackedObjectBBox.cpp b/src/TrackedObjectBBox.cpp
@@ -388,7 +388,7 @@ void TrackedObjectBBox::SetJsonValue(const Json::Value root)
 
     // Set the id of the child clip
     // Does not allow to link to the parent clip
-    if (!root["child_clip_id"].isNull()){
+    if (!root["child_clip_id"].isNull() && root["box_id"].asString() != "None"){
         Clip* parentClip = (Clip *) ParentClip();
 
         if(parentClip && (root["child_clip_id"].asString() != parentClip->Id())){

diff --git a/src/effects/ObjectDetection.cpp b/src/effects/ObjectDetection.cpp
@@ -309,11 +309,13 @@ Json::Value ObjectDetection::JsonValue() const {
     }
 
     // Add the selected object Json to root
-    auto selectedObject = trackedObjects.at(selectedObjectIndex);
-    if (selectedObject){
-        Json::Value selectedObjectJSON = selectedObject->JsonValue();
-        for (auto const& key : selectedObjectJSON.getMemberNames())
-            root[key] = selectedObjectJSON[key];
+    if(trackedObjects.count(selectedObjectIndex) != 0){
+        auto selectedObject = trackedObjects.at(selectedObjectIndex);
+        if (selectedObject){
+            Json::Value selectedObjectJSON = selectedObject->JsonValue();
+            for (auto const& key : selectedObjectJSON.getMemberNames())
+                root[key] = selectedObjectJSON[key];
+        }
     }
 
 	// return JsonValue
@@ -366,9 +368,11 @@ void ObjectDetection::SetJsonValue(const Json::Value root) {
     }
 
     // Set the selected object's properties
-    auto selectedObject = trackedObjects.at(selectedObjectIndex);
-    if (selectedObject)
-        selectedObject->SetJsonValue(root);
+    if(trackedObjects.count(selectedObjectIndex) != 0){
+        auto selectedObject = trackedObjects.at(selectedObjectIndex);
+        if (selectedObject)
+            selectedObject->SetJsonValue(root);
+    }
 }
 
 // Get all properties for a specific frame
@@ -378,9 +382,11 @@ std::string ObjectDetection::PropertiesJSON(int64_t requested_frame) const {
 	Json::Value root;
 
     // Add the selected object Json to root
-    auto selectedObject = trackedObjects.at(selectedObjectIndex);
-    if (selectedObject)
-        root = selectedObject->PropertiesJSON(requested_frame);
+    if(trackedObjects.count(selectedObjectIndex) != 0){
+        auto selectedObject = trackedObjects.at(selectedObjectIndex);
+        if (selectedObject)
+            root = selectedObject->PropertiesJSON(requested_frame);
+    }
 
     root["selected_object_index"] = add_property_json("Selected Object", selectedObjectIndex, "int", "", NULL, 0, 200, false, requested_frame);
 	root["id"] = add_property_json("ID", 0.0, "string", Id(), NULL, -1, -1, true, requested_frame);