usb_direct fix for rev2 shuttle, playbackengine locks again, viewer cursor fix

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / awindowgui.C

diff --git a/cinelerra-5.1/cinelerra/awindowgui.C b/cinelerra-5.1/cinelerra/awindowgui.C
index a5e4007c20a66b787e0adb9364876b42c1c7dc30..8b53f7ad594b1cb7a61d0e3f7390307e23570624 100644 (file)
--- a/cinelerra-5.1/cinelerra/awindowgui.C
+++ b/cinelerra-5.1/cinelerra/awindowgui.C
@@ -398,8 +398,10 @@ int AssetViewPopup::button_press_event()
                vedl->set_inpoint(start);
                vedl->set_outpoint(end);
                vedl->local_session->set_selectionstart(start);
-               vedl->local_session->set_selectionend(end);
-               vwindow->update_position(CHANGE_NONE, 0, 1, 0);
+               vedl->local_session->set_selectionend(start);
+               vwindow->gui->lock_window("AssetViewPopup::button_press_event");
+               vwindow->update_position();
+               vwindow->gui->unlock_window();
                return 1;
        }
        else {
@@ -1213,14 +1215,6 @@ AWindowGUI::AWindowGUI(MWindow *mwindow, AWindow *awindow)
        video_vframe = 0;               video_icon = 0;
        label_vframe = 0;               label_icon = 0;
 
-       atransition_vframe = 0;         atransition_icon = 0;
-       vtransition_vframe = 0;         vtransition_icon = 0;
-       aeffect_vframe = 0;             aeffect_icon = 0;
-       ladspa_vframe = 0;              ladspa_icon = 0;
-       veffect_vframe = 0;             veffect_icon = 0;
-       ff_aud_vframe = 0;              ff_aud_icon = 0;
-       ff_vid_vframe = 0;              ff_vid_icon = 0;
-
        aeffect_folder_vframe = 0;      aeffect_folder_icon = 0;
        atransition_folder_vframe = 0;  atransition_folder_icon = 0;
        clip_folder_vframe = 0;         clip_folder_icon = 0;