merged master and fixed superimpose effect

project/loadthread.cpp

@@ -605,6 +605,22 @@ Media* LoadThread::find_loaded_folder_by_id(int id) {
   return nullptr;
 }
 
+void LoadThread::OrganizeFolders(int folder) {
+  qDebug() << "starting with" << folder;
+
+  for (int i=0;i<loaded_folders.size();i++) {
+    MediaPtr item = loaded_folders.at(i);
+    int parent_id = item->temp_id2;
+
+    if (parent_id == folder) {
+      olive::project_model.appendChild(find_loaded_folder_by_id(parent_id), item);
+
+      OrganizeFolders(parent_id);
+    }
+
+  }
+}
+
 void LoadThread::run() {
   mutex.lock();
 
@@ -657,15 +673,11 @@ void LoadThread::run() {
     cont = load_worker(file, stream, MEDIA_TYPE_FOLDER);
   }
 
-  // load media
   if (cont) {
     // since folders loaded correctly, organize them appropriately
-    for (int i=0;i<loaded_folders.size();i++) {
-      MediaPtr folder = loaded_folders.at(i);
-      int parent = folder->temp_id2;
-      olive::project_model.appendChild(find_loaded_folder_by_id(parent), folder);
-    }
+    OrganizeFolders();
 
+    // load media
     cont = load_worker(file, stream, MEDIA_TYPE_FOOTAGE);
   }