summaryrefslogtreecommitdiff
path: root/gtk2_ardour/redirect_box.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2005-12-02 19:18:26 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2005-12-02 19:18:26 +0000
commit3436df6eabaefa19b2572a2765e6d8ac08942c9d (patch)
treef2dd8e9108a6e5d3bcb9984e6c8ea05861a8ce10 /gtk2_ardour/redirect_box.cc
parent7aee3d6fbf0fedc8c34def2461fc8064d2cc654c (diff)
the usual blob of fixes. note the requirement for ComboBoxText::set_active_text()
git-svn-id: svn://localhost/trunk/ardour2@160 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/redirect_box.cc')
-rw-r--r--gtk2_ardour/redirect_box.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/gtk2_ardour/redirect_box.cc b/gtk2_ardour/redirect_box.cc
index 95ce4110a4..54179f54ef 100644
--- a/gtk2_ardour/redirect_box.cc
+++ b/gtk2_ardour/redirect_box.cc
@@ -116,7 +116,7 @@ RedirectBox::RedirectBox (Placement pcmnt, Session& sess, Route& rt, PluginSelec
_route.redirects_changed.connect (mem_fun(*this, &RedirectBox::redirects_changed));
redirect_eventbox.signal_enter_notify_event().connect (bind (sigc::ptr_fun (RedirectBox::enter_box), this));
- redirect_eventbox.signal_leave_notify_event().connect (bind (sigc::ptr_fun (RedirectBox::leave_box), this));
+ //redirect_eventbox.signal_leave_notify_event().connect (bind (sigc::ptr_fun (RedirectBox::leave_box), this));
redirect_display.signal_button_press_event().connect (mem_fun(*this, &RedirectBox::redirect_button));
redirect_display.signal_button_release_event().connect (mem_fun(*this, &RedirectBox::redirect_button));
@@ -262,7 +262,9 @@ RedirectBox::redirect_button (GdkEventButton *ev)
{
Redirect *redirect;
TreeModel::Row row = *(redirect_display.get_selection()->get_selected());
- redirect = row[columns.redirect];
+
+ if (row)
+ redirect = row[columns.redirect];
switch (ev->type) {
case GDK_BUTTON_PRESS:
@@ -374,6 +376,7 @@ void
RedirectBox::choose_plugin ()
{
sigc::connection newplug_connection = _plugin_selector.PluginCreated.connect (mem_fun(*this,&RedirectBox::insert_plugin_chosen));
+ _plugin_selector.show_all();
_plugin_selector.run ();
newplug_connection.disconnect();
}