fixes for vicons checkin

[goodguy/history.git] / cinelerra-5.0 / cinelerra / cwindowgui.C

diff --git a/cinelerra-5.0/cinelerra/cwindowgui.C b/cinelerra-5.0/cinelerra/cwindowgui.C
index a0762595f48499208bb4ea030d4c922d3bb87cfb..95097523e26d62ddf3a7b96806312fed695dd171 100644 (file)
--- a/cinelerra-5.0/cinelerra/cwindowgui.C
+++ b/cinelerra-5.0/cinelerra/cwindowgui.C
@@ -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;
@@ -2118,7 +2119,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 +2175,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();