update shuttlerc, fix vwdw lock update_position

diff --git a/cinelerra-5.1/cinelerra/awindowgui.C b/cinelerra-5.1/cinelerra/awindowgui.C
index a36c4191e6fffddb55ecdd07a4bbff29313e58a4..65e5ba2591b5c30782a936f69fcb27097cfca339 100644 (file)
--- 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 2bb7bfd1d43c1b68fb9781b7a12cd11e2d884018..0c9affbfdf326035ea64cb4eeeea0d4393a91f91 100644 (file)
--- 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