X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fawindowgui.C;h=a88acce6cc95473fa02a2da27cf60d092e69651a;hp=fc8adea9c725fdada4553201e2eba9b7a6e0523c;hb=05a3780d6edd6a792f0dde46ed69e4b740af5a51;hpb=6c5258a9791775f706e55c280da75ed6f6ef1720 diff --git a/cinelerra-5.1/cinelerra/awindowgui.C b/cinelerra-5.1/cinelerra/awindowgui.C index fc8adea9..a88acce6 100644 --- a/cinelerra-5.1/cinelerra/awindowgui.C +++ b/cinelerra-5.1/cinelerra/awindowgui.C @@ -2801,7 +2801,7 @@ int AWindowAssets::selection_changed() deactivate_selection(); } - else if( get_button_down() && + else if( get_button_down() && !gui->play_off && mwindow->edl->session->assetlist_format != ASSETS_TEXT ) { item = (AssetPicon*)get_selection(0, 0); if( item && !get_selection(0, 1) ) { @@ -2854,6 +2854,7 @@ void AWindowAssets::draw_background() int AWindowAssets::drag_start_event() { + gui->vicon_thread->set_view_popup(0); int collect_pluginservers = 0; int collect_assets = 0, proxy = 0;