X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Floadfile.C;h=27c26991e7999d738b975cfcb6b1cd8cbc309264;hb=e21da84b50724b40b38b5e0373d1a25e587169ee;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..27c26991 100644
--- a/cinelerra-5.1/cinelerra/loadfile.C
+++ b/cinelerra-5.1/cinelerra/loadfile.C
@@ -2,6 +2,7 @@
 /*
  * CINELERRA
  * Copyright (C) 2009 Adam Williams <broadcast at earthling dot net>
+ * Copyright (C) 2003-2016 Cinelerra CV contributors
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -80,7 +81,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,26 +137,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;
 }
 
 
@@ -175,6 +169,8 @@ LoadFileWindow::LoadFileWindow(MWindow *mwindow,
 {
 	this->thread = thread;
 	this->mwindow = mwindow;
+// *** CONTEXT_HELP ***
+	context_help_set_keyword("Loading Files");
 }
 
 LoadFileWindow::~LoadFileWindow()