X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fbatchrender.C;h=6dcdbc62f69fd7bf8fcd0015f011de87b2e93786;hb=166867a58d74619aa11aeb562a994cc364d62231;hp=734ee3aa03e172e5827fba43bf2277ad7b369cce;hpb=0df48ad2d876409c5beeae2e21933a728ea76c33;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/batchrender.C b/cinelerra-5.1/cinelerra/batchrender.C
index 734ee3aa..6dcdbc62 100644
--- a/cinelerra-5.1/cinelerra/batchrender.C
+++ b/cinelerra-5.1/cinelerra/batchrender.C
@@ -121,6 +121,8 @@ BatchRenderJob *BatchRenderJob::copy()
 void BatchRenderJob::load(FileXML *file)
 {
 	int result = 0;
+	char job_title[BCSTRLEN];
+	strcpy(job_title, file->tag.title);
 
 	enabled = file->tag.get_property("ENABLED", enabled);
 	farmed = file->tag.get_property("FARMED", farmed);
@@ -138,7 +140,7 @@ void BatchRenderJob::load(FileXML *file)
 // coding maintenance.  The defaults must now be stuffed into the XML for
 // unique storage.
 			BC_Hash defaults;
-			defaults.load_string(file->read_text());
+			defaults.load_string(file->read_text(job_title));
 			asset->load_defaults(&defaults,
 				"", 0, 1, 0, 0, 0);
 		}
@@ -179,7 +181,9 @@ char *BatchRenderJob::create_script(EDL *edl, ArrayList<Indexable *> *idxbls)
 
 int BatchRenderJob::get_strategy()
 {
-	return Render::get_strategy(farmed, labeled);
+	int range = File::is_image_render(asset->format) ?
+		RANGE_1FRAME : RANGE_SELECTION;
+	return Render::get_strategy(farmed, labeled, range);
 }
 
 
@@ -513,7 +517,7 @@ int BatchRenderThread::test_edl_files()
 	if( !ret && mwindow )
 		ret = test_errmsg(no_rendering, _("%d job EDLs no audio or video in render asset format\n"), 0);
 	if( !ret && mwindow )
-		ret = test_errmsg(no_labels, _("%d job EDLs render file per label and no labels\n"), 0);
+		ret = test_errmsg(no_labels, _("%d job EDLs Create new file at labels checked, but no labels\n"), 0);
 	if( ret )
 		is_rendering = 0;
 	return ret;
@@ -1196,6 +1200,7 @@ void BatchRenderLoadList::run()
 
 	int result2 = filewindow.run_window();
 	if( !result2 ) {
+		thread->gui->lock_window("BatchRenderLoadList::run");
 		strcpy(thread->batch_path, filewindow.get_submitted_path());
 		thread->gui->batch_path->update(thread->batch_path);
 		thread->mwindow->defaults->update("DEFAULT_BATCHLOADPATH", thread->batch_path);
@@ -1203,6 +1208,7 @@ void BatchRenderLoadList::run()
 		thread->gui->create_list(1);
 		thread->current_job = 0;
 		thread->gui->change_job();
+		thread->gui->unlock_window();
 	}
 
 	startup_lock->lock("BatchRenderLoadList::run");