X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Feditpanel.C;fp=cinelerra-5.1%2Fcinelerra%2Feditpanel.C;h=b370723a0a4a8f0f49acec859d6eae32c38df2e4;hb=95f86161c3b9c422bbd04ec8f685aa7e856d6dd7;hp=1c357b549332165af74ebc32a0a5bc507fc19351;hpb=09c2f5f26f06b33101230e42cdb0a482a6cccf76;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/editpanel.C b/cinelerra-5.1/cinelerra/editpanel.C
index 1c357b54..b370723a 100644
--- a/cinelerra-5.1/cinelerra/editpanel.C
+++ b/cinelerra-5.1/cinelerra/editpanel.C
@@ -953,6 +953,8 @@ EditCut::~EditCut()
 }
 int EditCut::keypress_event()
 {
+	if( ctrl_down() || shift_down() || alt_down() )
+		return 0;
 	if( get_keypress() == 'x' )
 		return handle_event();
 	return 0;
@@ -1011,14 +1013,16 @@ EditCommercial::EditCommercial(MWindow *mwindow, EditPanel *panel, int x, int y)
 {
 	this->mwindow = mwindow;
 	this->panel = panel;
-	set_tooltip(_("Commercial ( shift X )"));
+	set_tooltip(_("Commercial ( shift A )"));
 }
 EditCommercial::~EditCommercial()
 {
 }
 int EditCommercial::keypress_event()
 {
-	if( get_keypress() == 'X' )
+	if( ctrl_down() || !shift_down() || alt_down() )
+		return 0;
+	if( get_keypress() == 'A' )
 		return handle_event();
 	return 0;
 }
@@ -1180,6 +1184,8 @@ EditUndo::~EditUndo()
 }
 int EditUndo::keypress_event()
 {
+	if( ctrl_down() || shift_down() || alt_down() )
+		return 0;
 	if( get_keypress() == 'z' )
 		return handle_event();
 	return 0;
@@ -1202,6 +1208,8 @@ EditRedo::~EditRedo()
 }
 int EditRedo::keypress_event()
 {
+	if( ctrl_down() || !shift_down() || alt_down() )
+		return 0;
 	if( get_keypress() == 'Z' )
 		return handle_event();
 	return 0;