X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Frender.C;h=1f76a92a25363539f7dedb0d0cb579a9ffc59ce4;hb=43821d27c5b51c4250a251f20c98878f54deb288;hp=0098afffd70ee4763105e19d6c210ed762b5d253;hpb=5820b5f022aeec75ec03f7dd0121aa8a3d7f7590;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/render.C b/cinelerra-5.1/cinelerra/render.C
index 0098afff..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;
 		}
@@ -270,9 +269,7 @@ void Render::start_interactive()
 		mode = Render::INTERACTIVE;
 		BC_DialogThread::start();
 	}
-	else if( render_window && !in_progress )
-		render_window->raise_window();
-	else {
+	else if( in_progress ) {
 		ErrorBox error_box(_(PROGRAM_NAME ": Error"),
 			mwindow->gui->get_abs_cursor_x(1),
 			mwindow->gui->get_abs_cursor_y(1));
@@ -280,6 +277,9 @@ void Render::start_interactive()
 		error_box.raise_window();
 		error_box.run_window();
 	}
+	else if( render_window ) {
+		render_window->raise_window();
+	}
 }
 
 
@@ -289,22 +289,22 @@ void Render::start_batches(ArrayList<BatchRenderJob*> *jobs)
 	{
 		mode = Render::BATCH;
 		batch_cancelled = 0;
-		// raise the window if rendering hasn't started yet
-		if( render_window && ! in_progress ) {
-			render_window->raise_window();
-		}
-		else {
-			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");
-			error_box.raise_window();
-			error_box.run_window();
-		}
 		this->jobs = jobs;
 		completion->reset();
 		start_render();
 	}
+	else if( in_progress ) {
+		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");
+		error_box.raise_window();
+		error_box.run_window();
+	}
+	// raise the window if rendering hasn't started yet
+	else if( render_window ) {
+		render_window->raise_window();
+	}
 }
 
 void Render::start_batches(ArrayList<BatchRenderJob*> *jobs,
@@ -330,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
@@ -529,6 +528,7 @@ void Render::start_render()
 	in_progress = 0;
 	elapsed_time = 0.0;
 	result = 0;
+	completion->reset();
 	thread->start();
 }
 
@@ -1011,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__);
 }
 
@@ -1096,6 +1095,7 @@ void RenderThread::run()
 			mwindow->batch_render->update_done(-1, 0, 0);
 		}
 	}
+	render->completion->unlock();
 }