X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=inline;f=cinelerra-5.1%2Fcinelerra%2Fmwindowedit.C;h=142c2a3849e9f06d5098bd28401abbfa598547e0;hb=3ad39dda113124e7e1bb11a808541e6311417863;hp=2366c3884cb17aa3b1b1739ecd3228fde98d56a6;hpb=86bd203ac1fc29d93f63d13e2979468f06bdc3a2;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/mwindowedit.C b/cinelerra-5.1/cinelerra/mwindowedit.C
index 2366c388..142c2a38 100644
--- a/cinelerra-5.1/cinelerra/mwindowedit.C
+++ b/cinelerra-5.1/cinelerra/mwindowedit.C
@@ -1207,17 +1207,16 @@ if( debug ) printf("MWindow::load_assets %d\n", __LINE__);
 		EDL *new_edl = new EDL;
 		new_edl->create_objects();
 		new_edl->copy_session(edl);
-		new_edls.append(new_edl);
-
 		if( !indexable->is_asset ) {
 			EDL *nested_edl = (EDL*)indexable;
-			new_edl->to_nested(nested_edl);
-			new_edl->local_session->set_clip_path(nested_edl);
+			new_edl->create_nested(nested_edl);
+			new_edl->set_path(indexable->path);
 		}
 		else {
 			Asset *asset = (Asset*)indexable;
 			asset_to_edl(new_edl, asset);
 		}
+		new_edls.append(new_edl);
 
 		if( labels ) {
 			for( RecordLabel *label=labels->first; label; label=label->next ) {
@@ -1559,7 +1558,7 @@ int MWindow::paste_edls(ArrayList<EDL*> *new_edls, int load_mode,
 			edl->add_clip(new_edl->clips[j]);
 		}
 		for( int j=0; j<new_edl->nested_edls.size(); ++j ) {
-			edl->nested_edls.get_copy(new_edl->nested_edls[j]);
+			edl->nested_edls.get_nested(new_edl->nested_edls[j]);
 		}
 
 		if( new_edl->total_vwindow_edls() ) {
@@ -1601,6 +1600,10 @@ void MWindow::paste_silence()
 {
 	double start = edl->local_session->get_selectionstart();
 	double end = edl->local_session->get_selectionend();
+	if( EQUIV(start, end) ) {
+		if( edl->session->frame_rate > 0 )
+			end += 1./edl->session->frame_rate;
+	}
 	undo->update_undo_before();
 	edl->paste_silence(start, end,
 		edl->session->labels_follow_edits,