X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fclippopup.C;h=07ae7252fedd46e4749f085cb09b10aaceddfadc;hb=d94bbdeebde4f16a77c388f9f28114b945db41d9;hp=602fbbd03802354f344e7e57026ee571973eb82d;hpb=d26ed189093987978190ee07f485a4840746c13c;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/clippopup.C b/cinelerra-5.1/cinelerra/clippopup.C
index 602fbbd0..07ae7252 100644
--- a/cinelerra-5.1/cinelerra/clippopup.C
+++ b/cinelerra-5.1/cinelerra/clippopup.C
@@ -138,10 +138,11 @@ ClipPopupInfo::~ClipPopupInfo()
 int ClipPopupInfo::handle_event()
 {
 	int cur_x, cur_y;
-	popup->gui->get_abs_cursor_xy(cur_x, cur_y, 0);
+	popup->gui->get_abs_cursor(cur_x, cur_y, 0);
 
 	if( mwindow->session->drag_assets->total ) {
-		mwindow->awindow->asset_edit->edit_asset(
+		AssetEdit *asset_edit = mwindow->awindow->get_asset_editor();
+		asset_edit->edit_asset(
 			mwindow->session->drag_assets->values[0], cur_x, cur_y);
 	}
 	else
@@ -166,7 +167,7 @@ ClipPopupSort::~ClipPopupSort()
 
 int ClipPopupSort::handle_event()
 {
-	mwindow->awindow->gui->sort_assets();
+	mwindow->awindow->gui->sort_assets(0);
 	return 1;
 }
 
@@ -185,7 +186,6 @@ ClipPopupView::~ClipPopupView()
 int ClipPopupView::handle_event()
 {
 	VWindow *vwindow = mwindow->get_viewer(1, DEFAULT_VWINDOW);
-	vwindow->gui->lock_window("ClipPopupView::handle_event");
 
 	if( mwindow->session->drag_assets->total )
 		vwindow->change_source(
@@ -195,7 +195,6 @@ int ClipPopupView::handle_event()
 		vwindow->change_source(
 			mwindow->session->drag_clips->values[0]);
 
-	vwindow->gui->unlock_window();
 	return 1;
 }