X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fvrender.C;h=43893b2770106845d2fbe6533eadb657bc1e3d81;hb=099132c524d32342be6cfc4948ecb1b3a439b988;hp=770dfb8877e168e7f92be2e7123ce4f653801e06;hpb=b46dd3711f7aaa94d2df9f27cd2ce16f7487693a;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/vrender.C b/cinelerra-5.1/cinelerra/vrender.C
index 770dfb88..43893b27 100644
--- a/cinelerra-5.1/cinelerra/vrender.C
+++ b/cinelerra-5.1/cinelerra/vrender.C
@@ -22,6 +22,7 @@
 #include "asset.h"
 #include "bcsignals.h"
 #include "cache.h"
+#include "canvas.h"
 #include "clip.h"
 #include "condition.h"
 #include "datatype.h"
@@ -74,9 +75,10 @@ VRender::VRender(RenderEngine *renderengine)
 
 VRender::~VRender()
 {
-	if(input_temp) delete input_temp;
-	if(transition_temp) delete transition_temp;
-	if(overlayer) delete overlayer;
+	renderengine->wait_done();
+	delete overlayer;
+	delete input_temp;
+	delete transition_temp;
 }
 
 
@@ -97,10 +99,9 @@ Module* VRender::new_module(Track *track)
 
 int VRender::flash_output()
 {
-	if(video_out)
-		return renderengine->video->write_buffer(video_out, renderengine->get_edl());
-	else
-		return 0;
+	if( !video_out ) return 0;
+	renderengine->update_scope(video_out);
+	return renderengine->video->write_buffer(video_out, renderengine->get_edl());
 }
 
 int VRender::process_buffer(VFrame *video_out,
@@ -481,8 +482,9 @@ void VRender::run()
 			framerate_timer.update();
 		}
 		if(debug) printf("VRender::run %d done=%d\n", __LINE__, done);
-		if( !interrupt )
-			interrupt = renderengine->video->interrupt;
+		if( !interrupt ) interrupt = renderengine->interrupted;
+		if( !interrupt ) interrupt = renderengine->video->interrupt;
+		if( !interrupt ) interrupt = vconsole->interrupt;
 	}