X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcwindowgui.C;h=1aff4d6c172fa10c3c27cf3aedd2dd7c2c83c557;hb=6e880be00673eac08e9463e3ce752aaf4c18085b;hp=7cb5a1007d5bde2bdd77632f505f22e1f43eab0d;hpb=b5bfe3e40a7255ae60a21d885587ada6e145e3d5;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/cwindowgui.C b/cinelerra-5.1/cinelerra/cwindowgui.C
index 7cb5a100..1aff4d6c 100644
--- a/cinelerra-5.1/cinelerra/cwindowgui.C
+++ b/cinelerra-5.1/cinelerra/cwindowgui.C
@@ -58,6 +58,7 @@
 #include "tracks.h"
 #include "transportque.h"
 #include "vtrack.h"
+#include "zoombar.h"
 
 
 static double my_zoom_table[] =
@@ -281,7 +282,7 @@ int CWindowGUI::button_press_event()
 	if( current_operation == CWINDOW_NONE &&
 	    mwindow->edl != 0 && canvas->get_canvas() &&
 	    mwindow->edl->session->cwindow_click2play &&
-	    canvas->get_canvas()->get_cursor_over_window() ) {
+	    canvas->get_canvas()->cursor_above() ) {
 		switch( get_buttonpress() ) {
 		case LEFT_BUTTON:
 			if( !cwindow->playback_engine->is_playing_back ) {
@@ -744,7 +745,7 @@ CWindowEditing::CWindowEditing(MWindow *mwindow, CWindow *cwindow)
 		mwindow->theme->cedit_x, mwindow->theme->cedit_y,
 		mwindow->edl->session->editing_mode,
 		0, // use_editing_mode
-		1, // use_keyframe
+		0, // use_keyframe
 		0, // use_splice
 		0, // use_overwrite
 		1, // use_copy
@@ -1100,7 +1101,7 @@ int CWindowCanvas::scope_on()
 
 void CWindowCanvas::draw_scope(VFrame *output)
 {
-	if( gui->edit_panel->scope_dialog )
+	if( gui->edit_panel->scope_dialog && output )
 		gui->edit_panel->scope_dialog->process(output);
 }
 
@@ -2632,6 +2633,11 @@ void CWindowCanvas::reset_keyframe(int do_camera)
 		z_keyframe->set_value(1);
 
 		gui->sync_parameters(CHANGE_PARAMS, 1, 1);
+		MWindowGUI *mgui = mwindow->gui;
+		mgui->lock_window("CWindowCanvas::reset_keyframe");
+		gui->mwindow->edl->local_session->reset_view_limits();
+		gui->mwindow->gui->zoombar->update_autozoom();
+		mgui->unlock_window();
 	}
 }