X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.0%2Fcinelerra%2Fcwindowgui.C;h=c1f98d3a21532264b1694a5d5268b131e3945177;hp=216e672a42dc8b3741b3b507574e6baf89455b34;hb=52fcc46226f9df46f9ce9d0566dc568455a7db0b;hpb=2d99bb8ce591f05a31464b517d85dc2bc35b2abe

diff --git a/cinelerra-5.0/cinelerra/cwindowgui.C b/cinelerra-5.0/cinelerra/cwindowgui.C
index 216e672a..c1f98d3a 100644
--- a/cinelerra-5.0/cinelerra/cwindowgui.C
+++ b/cinelerra-5.0/cinelerra/cwindowgui.C
@@ -76,7 +76,7 @@ static int total_zooms = sizeof(my_zoom_table) / sizeof(double);
 
 
 CWindowGUI::CWindowGUI(MWindow *mwindow, CWindow *cwindow)
- : BC_Window(PROGRAM_NAME ": Compositor",
+ : BC_Window(_(PROGRAM_NAME ": Compositor"),
  	mwindow->session->cwindow_x, 
     mwindow->session->cwindow_y, 
     mwindow->session->cwindow_w, 
@@ -122,6 +122,7 @@ CWindowGUI::~CWindowGUI()
  	delete zoom_panel;
 	delete active;
 	delete inactive;
+	delete orig_mask_keyframe;
 }
 
 void CWindowGUI::create_objects()
@@ -902,7 +903,7 @@ void CWindowCanvas::draw_refresh(int flush)
 	if(get_canvas() && !get_canvas()->get_video_on())
 	{
 
-		if(refresh_frame)
+		if(refresh_frame && refresh_frame->get_w()>0 && refresh_frame->get_h()>0)
 		{
 			float in_x1, in_y1, in_x2, in_y2;
 			float out_x1, out_y1, out_x2, out_y2;
@@ -1090,6 +1091,7 @@ int CWindowCanvas::do_ruler(int draw,
 // Show ruler
 				do_ruler(1, 0, 0, 0);
 				get_canvas()->flash();
+				gui->update_tool();
 			}
 			else
 			switch(gui->ruler_handle)
@@ -2118,7 +2120,7 @@ int CWindowCanvas::do_eyedrop(int &rerender, int button_press, int draw)
 
 
 
-	if(refresh_frame)
+	if(refresh_frame && refresh_frame->get_w()>0 && refresh_frame->get_h()>0)
 	{
 
 		if(draw)
@@ -2174,7 +2176,7 @@ int CWindowCanvas::do_eyedrop(int &rerender, int button_press, int draw)
 
 // Get color out of frame.
 // Doesn't work during playback because that bypasses the refresh frame.
-		if(refresh_frame)
+		if(refresh_frame && refresh_frame->get_w()>0 && refresh_frame->get_h()>0)
 		{
 			float cursor_x = get_cursor_x();
 			float cursor_y = get_cursor_y();