fixed a bunch of multithreaded loading issues and #174

project/clip.cpp

@@ -210,6 +210,7 @@ double Clip::getMediaFrameRate() {
         if (!qIsNaN(rate)) return rate;
     }
     if (sequence != NULL) return sequence->frame_rate;
+	return qSNaN();
 }
 
 void Clip::recalculateMaxLength() {

project/effect.cpp

@@ -432,7 +432,7 @@ Effect::~Effect() {
 		close();
 	}
 
-    delete container;
+	delete container;
 
 	for (int i=0;i<rows.size();i++) {
 		delete rows.at(i);
@@ -750,11 +750,11 @@ void Effect::close() {
 	if (!isOpen) {
 		dout << "[WARNING] Tried to close an effect that was already closed";
 	}
+	delete_texture();
 	if (glslProgram != NULL) {
 		delete glslProgram;
 		glslProgram = NULL;
 	}
-	delete_texture();
 	isOpen = false;
 }
 
@@ -991,7 +991,6 @@ bool Effect::valueHasChanged(double timecode) {
 
 void Effect::delete_texture() {
 	if (texture != NULL) {
-		texture->destroy();
 		delete texture;
 		texture = NULL;
 	}

project/media.cpp

@@ -183,8 +183,8 @@ const QString &Media::get_name() {
     switch (type) {
     case MEDIA_TYPE_FOOTAGE: return to_footage()->name;
     case MEDIA_TYPE_SEQUENCE: return to_sequence()->name;
-    case MEDIA_TYPE_FOLDER: return folder_name;
-    }
+	default: return folder_name;
+	}
 }
 
 void Media::set_name(const QString &n) {