X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Floadfile.C;h=d9d9fe78b413dac53729e3276c6868c300ca7c90;hp=a946077393e514a2e007379a7187b92a77f0a758;hb=b104b77f5296719bd5e6de8472eb71542ddaedec;hpb=8a93ba3cbbf067788bf4bbbf35502f8ad2d8f7e0 diff --git a/cinelerra-5.1/cinelerra/loadfile.C b/cinelerra-5.1/cinelerra/loadfile.C index a9460773..d9d9fe78 100644 --- a/cinelerra-5.1/cinelerra/loadfile.C +++ b/cinelerra-5.1/cinelerra/loadfile.C @@ -80,7 +80,7 @@ LoadFileThread::LoadFileThread(MWindow *mwindow, Load *load) this->mwindow = mwindow; this->load = load; this->window = 0; - load_mode = LOADMODE_REPLACE; + load_mode = LOADMODE_RESOURCESONLY; edl_mode = LOADMODE_EDL_CLIP; } @@ -136,23 +136,19 @@ void LoadFileThread::load_apply() // No file selected if( !path_list.size() ) return; + 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; } @@ -172,6 +168,8 @@ LoadFileWindow::LoadFileWindow(MWindow *mwindow, { this->thread = thread; this->mwindow = mwindow; +// *** CONTEXT_HELP *** + context_help_set_keyword("Loading Files"); } LoadFileWindow::~LoadFileWindow()