Protect against linking the tracked object with the parent clip

src/TrackedObjectBBox.cpp

@@ -378,9 +378,15 @@ void TrackedObjectBBox::SetJsonValue(const Json::Value root)
     if (!root["protobuf_data_path"].isNull())
         protobufDataPath = root["protobuf_data_path"].asString();
 
-    // Set the id of the child clio
-    if (!root["child_clip_id"].isNull())
-        ChildClipId(root["child_clip_id"].asString());
+    // Set the id of the child clip
+    // Does not allow to link to the parent clip
+    if (!root["child_clip_id"].isNull()){
+        Clip* parentClip = (Clip *) ParentClip();
+
+        if(parentClip && (root["child_clip_id"].asString() != parentClip->Id())){
+            ChildClipId(root["child_clip_id"].asString());
+        }
+    }
 
     // Set the Keyframes by the given JSON object
     if (!root["delta_x"].isNull())

src/TrackedObjectBase.cpp

@@ -33,16 +33,16 @@
 #include <functional>
 #include <utility>
 
-
-namespace openshot{
+namespace openshot
+{
 
 	// Blank constructor
-    TrackedObjectBase::TrackedObjectBase() : visible(1.0), draw_box(1)
+	TrackedObjectBase::TrackedObjectBase() : visible(1.0), draw_box(1)
 	{
 		// Initializes the id as "None"
 		id = "None";
 		childClipId = "None";
-    }
+	}
 
 	// Default constructor
 	TrackedObjectBase::TrackedObjectBase(std::string _id) : visible(1.0)
@@ -51,7 +51,8 @@ namespace openshot{
 		childClipId = "None";
 	}
 
-	Json::Value TrackedObjectBase::add_property_choice_json(std::string name, int value, int selected_value) const {
+	Json::Value TrackedObjectBase::add_property_choice_json(std::string name, int value, int selected_value) const
+	{
 		// Create choice
 		Json::Value new_choice = Json::Value(Json::objectValue);
 		new_choice["name"] = name;
@@ -61,4 +62,4 @@ namespace openshot{
 		// return JsonValue
 		return new_choice;
 	}
-}
+} // namespace openshot

src/TrackedObjectBase.h

@@ -55,7 +55,7 @@ namespace openshot {
 	 * predicted along the frames of a clip.
 	 */
     class TrackedObjectBase {
-	private:
+	protected:
 		std::string id;
 		std::string childClipId;