fix trace locks hang, drag handle rework-again, 12 reset btns on plugins, booby on

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

diff --git a/cinelerra-5.1/cinelerra/plugindialog.C b/cinelerra-5.1/cinelerra/plugindialog.C
index 439a6efb5d5feffb6d83f6b48bae9b94fd412dc7..89de2f99356d909f642cf41aee9d8dc5dbf53947 100644 (file)
--- a/cinelerra-5.1/cinelerra/plugindialog.C
+++ b/cinelerra-5.1/cinelerra/plugindialog.C
@@ -175,14 +175,7 @@ void PluginDialogThread::handle_close_event(int result)
                        mwindow->restart_brender();
                        mwindow->update_plugin_states();
                        mwindow->sync_parameters(CHANGE_EDL);
-                       mwindow->gui->update(1,
-                               1,
-                               0,
-                               0,
-                               1,
-                               0,
-                               0);
-
+                       mwindow->gui->update(1, NORMAL_DRAW, 0, 0, 1, 0, 0);
                        mwindow->gui->unlock_window();
                }
        }
@@ -258,18 +251,19 @@ void PluginDialog::create_objects()
                thread->data_type);
 
 // Construct listbox items
-       for(int i = 0; i < plugin_locations.total; i++)
+       for(int i = 0; i < plugin_locations.total; )
        {
                Track *track = mwindow->edl->tracks->number(plugin_locations.values[i]->module);
                char *track_title = track->title;
                int number = plugin_locations.values[i]->plugin;
                double start = mwindow->edl->local_session->get_selectionstart(1);
                Plugin *plugin = track->get_current_plugin(start, number, PLAY_FORWARD, 1, 0);
-               if( !plugin ) continue;
+               if( !plugin ) { plugin_locations.remove_object_number(i);  continue; }
                char string[BCTEXTLEN];
                const char *plugin_title = _(plugin->title);
                snprintf(string, sizeof(string), "%s: %s", track_title, plugin_title);
                shared_data.append(new BC_ListBoxItem(string));
+               ++i;
        }
        for(int i = 0; i < module_locations.total; i++)
        {