X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Floadfile.C;h=dce124911df4b2bb5b5505ac84350b12940f407d;hb=1da768016a2ecba0296b03d75c02879f99a0f582;hp=5d8dffceb4f6986ac65a4c9f9b985807f0db13d9;hpb=caf23b6b8e0024c33390ddaa165e11956e66f1c2;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/cinelerra/loadfile.C b/cinelerra-5.1/cinelerra/loadfile.C index 5d8dffce..dce12491 100644 --- a/cinelerra-5.1/cinelerra/loadfile.C +++ b/cinelerra-5.1/cinelerra/loadfile.C @@ -136,26 +136,19 @@ void LoadFileThread::load_apply() // No file selected if( !path_list.size() ) return; - - if( load_mode == LOADMODE_REPLACE ) - mwindow->set_filename(path_list[0]); + int replaced = load_mode == LOADMODE_REPLACE || + load_mode == LOADMODE_REPLACE_CONCATENATE ? 1 : 0; mwindow->interrupt_indexes(); mwindow->gui->lock_window("LoadFileThread::run"); - mwindow->load_filenames(&path_list, load_mode, edl_mode, 0); + mwindow->load_filenames(&path_list, load_mode, edl_mode, replaced); mwindow->gui->mainmenu->add_load(path_list.values[0]); mwindow->gui->unlock_window(); path_list.remove_all_objects(); mwindow->save_backup(); - mwindow->restart_brender(); - - if( load_mode == LOADMODE_REPLACE || - load_mode == LOADMODE_REPLACE_CONCATENATE ) - mwindow->session->changes_made = 0; - else - mwindow->session->changes_made = 1; + mwindow->session->changes_made = !replaced ? 1 : 0; }