label edit deadlock, build openexr cfg option, code cleanup

[goodguy/history.git] / cinelerra-5.1 / cinelerra / labelpopup.C

diff --git a/cinelerra-5.1/cinelerra/labelpopup.C b/cinelerra-5.1/cinelerra/labelpopup.C
index ee25db46670e0b7b02e7cf4c247e9118e3843a23..cbac067bd7ac68670d1674889025cd6617e193ef 100644 (file)
--- a/cinelerra-5.1/cinelerra/labelpopup.C
+++ b/cinelerra-5.1/cinelerra/labelpopup.C
@@ -75,8 +75,10 @@ LabelPopupEdit::~LabelPopupEdit()
 int LabelPopupEdit::handle_event()
 {
        AssetPicon *result = (AssetPicon*)gui->asset_list->get_selection(0,0);
+       int cur_x, cur_y;
+       gui->get_abs_cursor_xy(cur_x, cur_y, 0);
        if( result && result->label )
-               gui->awindow->label_edit->start(result->label);
+               gui->awindow->label_edit->start(result->label, cur_x, cur_y);
        return 1;
 }
 
@@ -144,8 +146,8 @@ LabelListMenu:: ~LabelListMenu()
 
 void LabelListMenu::create_objects()
 {
-       add_item(format = new AWindowListFormat(mwindow));
-       add_item(new AWindowListSort(mwindow));
+       add_item(format = new AWindowListFormat(mwindow, gui));
+       add_item(new AWindowListSort(mwindow, gui));
 }
 
 void LabelListMenu::update()