X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Frender.C;h=1f76a92a25363539f7dedb0d0cb579a9ffc59ce4;hb=d487c455c679829f94dee4ea8276ad3116f76de9;hp=21e33c20f5cdcdcc33e159959d060af007e2f97c;hpb=190b4810ec184c74ceab3fcd6faf09a91c92c53c;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/render.C b/cinelerra-5.1/cinelerra/render.C
index 21e33c20..1f76a92a 100644
--- a/cinelerra-5.1/cinelerra/render.C
+++ b/cinelerra-5.1/cinelerra/render.C
@@ -209,10 +209,9 @@ void MainPackageRenderer::set_progress(int64_t value)
 				eta,
 				TIME_HMS2);
 
-			printf(_("\r%d%% ETA: %s      "), (int)(100 *
-				(float)render->total_rendered /
-					render->progress_max),
-				string);
+			printf("\r%d%% %s: %s      ",
+				(int)(100 * (float)render->total_rendered / render->progress_max),
+				_("ETA"), string);
 			fflush(stdout);
 			render->last_eta = current_eta;
 		}
@@ -295,7 +294,7 @@ void Render::start_batches(ArrayList<BatchRenderJob*> *jobs)
 		start_render();
 	}
 	else if( in_progress ) {
-		ErrorBox error_box(PROGRAM_NAME ": Error",
+		ErrorBox error_box(_(PROGRAM_NAME ": Error"),
 				   mwindow->gui->get_abs_cursor_x(1),
 				   mwindow->gui->get_abs_cursor_y(1));
 		error_box.create_objects("Already rendering");
@@ -331,7 +330,6 @@ BC_Window* Render::new_gui()
 	batch_cancelled = 0;
 	format_error = 0;
 	result = 0;
-	completion->reset();
 
 	if(mode == Render::INTERACTIVE) {
 // Fix the asset for rendering
@@ -530,6 +528,7 @@ void Render::start_render()
 	in_progress = 0;
 	elapsed_time = 0.0;
 	result = 0;
+	completion->reset();
 	thread->start();
 }
 
@@ -1012,7 +1011,6 @@ if(debug) printf("Render::render %d\n", __LINE__);
 
 	render->packages = 0;
 	render->in_progress = 0;
-	render->completion->unlock();
 if(debug) printf("Render::render %d\n", __LINE__);
 }
 
@@ -1097,6 +1095,7 @@ void RenderThread::run()
 			mwindow->batch_render->update_done(-1, 0, 0);
 		}
 	}
+	render->completion->unlock();
 }