clip folder bug on reload, expander user folder drag/drop segv, remove libfdk src...

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

diff --git a/cinelerra-5.1/cinelerra/labeledit.C b/cinelerra-5.1/cinelerra/labeledit.C
index a2bd71f404cdf27eb00703ce724aa9182ff5be86..22681918de4c0ae8a245a4126682fc422501604a 100644 (file)
--- a/cinelerra-5.1/cinelerra/labeledit.C
+++ b/cinelerra-5.1/cinelerra/labeledit.C
@@ -61,7 +61,10 @@ void LabelEdit::handle_close_event(int result)
 
 void LabelEdit::handle_done_event(int result)
 {
-       awindow->gui->async_update_assets();
+       if( !result ) {
+               strcpy(label->textstr, label_edit_window->textbox->get_text());
+               awindow->gui->async_update_assets();
+       }
 }
 
 BC_Window *LabelEdit::new_gui()
@@ -86,11 +89,11 @@ LabelEditWindow::~LabelEditWindow()
 
 void LabelEditWindow::create_objects()
 {
+       lock_window("LabelEditWindow::create_objects");
        this->label = thread->label;
 
        int x = 10, y = 10;
        int x1 = x;
-       BC_TextBox *textbox;
        BC_Title *title;
 
        add_subwindow(title = new BC_Title(x1, y, _("Label Text:")));
@@ -102,6 +105,7 @@ void LabelEditWindow::create_objects()
        add_subwindow(new BC_CancelButton(this));
        show_window();
        textbox->activate();
+       unlock_window();
 }
 
 LabelEditComments::LabelEditComments(LabelEditWindow *window, int x, int y, int w, int rows)
@@ -112,7 +116,6 @@ LabelEditComments::LabelEditComments(LabelEditWindow *window, int x, int y, int
 
 int LabelEditComments::handle_event()
 {
-       strcpy(window->label->textstr, get_text());
        return 1;
 }