X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Floadfile.C;h=d9d9fe78b413dac53729e3276c6868c300ca7c90;hb=83b70dd60863377cb281e6be5206304e10373e30;hp=e40f716109a14005ba1a0e4ea716afdea5f5ffdb;hpb=e854f4eeda320c2626780afdac9546f482de54b1;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/loadfile.C b/cinelerra-5.1/cinelerra/loadfile.C
index e40f7161..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;
 }
 
@@ -121,7 +121,8 @@ void LoadFileThread::load_apply()
 	if( edl_mode == LOADMODE_EDL_FILEREF )
 		mwindow->show_warning(
 			&mwindow->preferences->warn_fileref,
-			_("Other projects can change this project"));
+			_("Other projects can change this project\n"
+			  "and this can become a broken link"));
 	ArrayList<char*> path_list;
 	path_list.set_array_delete();
 
@@ -135,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;
 }
 
 
@@ -174,6 +168,8 @@ LoadFileWindow::LoadFileWindow(MWindow *mwindow,
 {
 	this->thread = thread;
 	this->mwindow = mwindow;
+// *** CONTEXT_HELP ***
+	context_help_set_keyword("Loading Files");
 }
 
 LoadFileWindow::~LoadFileWindow()