From 2287a1f9b45c690c3604b93a05bff0543ea4fee8 Mon Sep 17 00:00:00 2001 From: Good Guy Date: Thu, 14 Feb 2019 21:17:19 -0700 Subject: [PATCH 1/1] update shuttlerc, fix vwdw lock update_position --- cinelerra-5.1/cinelerra/awindowgui.C | 2 ++ cinelerra-5.1/shuttlerc | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/cinelerra-5.1/cinelerra/awindowgui.C b/cinelerra-5.1/cinelerra/awindowgui.C index a36c4191..65e5ba25 100644 --- a/cinelerra-5.1/cinelerra/awindowgui.C +++ b/cinelerra-5.1/cinelerra/awindowgui.C @@ -399,7 +399,9 @@ int AssetViewPopup::button_press_event() vedl->set_outpoint(end); vedl->local_session->set_selectionstart(start); vedl->local_session->set_selectionend(end); + vwindow->gui->lock_window("AssetViewPopup::button_press_event"); vwindow->update_position(); + vwindow->gui->unlock_window(); return 1; } else { diff --git a/cinelerra-5.1/shuttlerc b/cinelerra-5.1/shuttlerc index 2bb7bfd1..0c9affbf 100644 --- a/cinelerra-5.1/shuttlerc +++ b/cinelerra-5.1/shuttlerc @@ -29,7 +29,7 @@ K10 Alt-XK_Left # Go to previous edit K11 Alt-XK_Right # Go to next edit K12 Ctrl-XK_Left # Go to previous label - K13 Ctrl-XK_Right # Go to next label + K13 Ctrl-XK_Right # Go to next label K14 "[" # Toggle in K15 "]" # Toggle out @@ -69,10 +69,10 @@ K10 Alt-XK_Left # Go to previous edit K11 Alt-XK_Right # Go to next edit K12 Ctrl-XK_Left # Go to previous label - K13 Ctrl-XK_Right # Go to next label + K13 Ctrl-XK_Right # Go to next label K14 "[" # Toggle in K15 "]" # Toggle out - + K1 "i" # Clip K2 "x" # Cut K3 "c" # Copy @@ -108,11 +108,11 @@ K10 "[" # Toggle in if no K14 K11 "]" # Toggle in if no K15 - K12 Alt-XK_Left # Go to previous edit - K13 Alt-XK_Right # Go to next edit + K12 Ctrl-XK_Left # Go to previous label + K13 Ctrl-XK_Right # Go to next label K14 "[" # Toggle in K15 "]" # Toggle out - + K1 "i" # Clip K2 "v" # Splice K3 "c" # Copy -- 2.26.2