X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fvwindow.C;h=d1ea6b03cc199c99cf8016d99fa8da3ce062697d;hp=243327cde48690b60ae7ed283ee3e956c7a5d19f;hb=b55798fc64eee00c6fab3b4763e791befb7275f9;hpb=3594cc12d62e8bf2c92e4e897aaf130645cbbc56

diff --git a/cinelerra-5.1/cinelerra/vwindow.C b/cinelerra-5.1/cinelerra/vwindow.C
index 243327cd..d1ea6b03 100644
--- a/cinelerra-5.1/cinelerra/vwindow.C
+++ b/cinelerra-5.1/cinelerra/vwindow.C
@@ -255,7 +255,7 @@ void VWindow::change_source(Indexable *indexable)
 	if(asset)
 		mwindow->asset_to_edl(this->edl, asset);
 	else
-		mwindow->edl_to_nested(this->edl, nested_edl);
+		this->edl->to_nested(nested_edl);
 
 // Update GUI
 	gui->change_source(this->edl, title);
@@ -273,13 +273,14 @@ void VWindow::change_source(EDL *edl)
 	if( playback_engine->is_playing_back )
 		stop_playback(1);
 
-	gui->lock_window("VWindow::change_source 3");
 //printf("VWindow::change_source %d %p\n", __LINE__, edl);
 // EDLs are identical
 //	if(edl && mwindow->edl->vwindow_edl &&
 //		edl->id == mwindow->edl->vwindow_edl->id) return;
 	if(edl && get_edl() && edl->id == get_edl()->id) return;
 
+	gui->lock_window("VWindow::change_source 3");
+
 	delete_source(1, 0);
 
 	if(edl)
@@ -421,14 +422,7 @@ void VWindow::copy()
 		double start = edl->local_session->get_selectionstart();
 		double end = edl->local_session->get_selectionend();
 		FileXML file;
-		edl->copy(start,
-			end,
-			0,
-			0,
-			0,
-			&file,
-			"",
-			1);
+		edl->copy(start, end, 0, &file, "", 1);
 		const char *file_string = file.string();
 		long file_length = strlen(file_string);
 		mwindow->gui->lock_window();