fix for wm that use borders with non-zero widths

[goodguy/history.git] / cinelerra-5.1 / cinelerra / mwindowedit.C

diff --git a/cinelerra-5.1/cinelerra/mwindowedit.C b/cinelerra-5.1/cinelerra/mwindowedit.C
index 2366c3884cb17aa3b1b1739ecd3228fde98d56a6..ca3475edb94716c44e4d2d658f671378b41e2fff 100644 (file)
--- 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() ) {