X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindowedit.C;h=9e53bde729a8d62cf0fd56f3e5bf7409c8512541;hp=a12321546dbd36aee6ce3c725e851ac211716e2c;hb=26fe9e12d6d42ae8f7087ac7f08242769d77a84a;hpb=27fd3ea07d41d179c8fdcb5b8481960c1fcc37d5 diff --git a/cinelerra-5.1/cinelerra/mwindowedit.C b/cinelerra-5.1/cinelerra/mwindowedit.C index a1232154..9e53bde7 100644 --- a/cinelerra-5.1/cinelerra/mwindowedit.C +++ b/cinelerra-5.1/cinelerra/mwindowedit.C @@ -1153,15 +1153,11 @@ int MWindow::paste_assets(double position, Track *dest_track, int overwrite) } void MWindow::load_assets(ArrayList *new_assets, - double position, - int load_mode, - Track *first_track, - RecordLabels *labels, - int edit_labels, - int edit_plugins, - int edit_autos, - int overwrite) + double position, int load_mode, Track *first_track, RecordLabels *labels, + int edit_labels, int edit_plugins, int edit_autos, int overwrite) { + if( load_mode == LOADMODE_RESOURCESONLY ) + load_mode = LOADMODE_ASSETSONLY; const int debug = 0; if( debug ) printf("MWindow::load_assets %d\n", __LINE__); if( position < 0 ) position = edl->local_session->get_selectionstart(); @@ -1444,7 +1440,8 @@ int MWindow::paste_edls(ArrayList *new_edls, int load_mode, } //PRINT_TRACE // Insert edl - if( load_mode != LOADMODE_RESOURCESONLY ) { + if( load_mode != LOADMODE_RESOURCESONLY && + load_mode != LOADMODE_ASSETSONLY ) { // Insert labels //printf("MWindow::paste_edls %f %f\n", current_position, edl_length); if( load_mode == LOADMODE_PASTE ||