From: Robin Gareus <robin@gareus.org>
Date: Tue, 30 Jul 2013 15:54:52 +0000 (+0200)
Subject: clean up 44fc92c3 (not a threading issue but sigc++ problem)
X-Git-Tag: 3.4~93
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=9b091a52cb77bfe9cce36668ebce714a1ec1eaae;p=ardour.git

clean up 44fc92c3 (not a threading issue but sigc++ problem)

RouteUI is not sigc::trackable itself (only derived classes are)
RouteUI::~RouteUI() does not disconnect from signals on destruction.
---

diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index 6a114b0e5f..c1dde89c39 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -171,7 +171,7 @@ RouteUI::init ()
 	monitor_disk_button->signal_button_press_event().connect (sigc::mem_fun(*this, &RouteUI::monitor_disk_press));
 	monitor_disk_button->signal_button_release_event().connect (sigc::mem_fun(*this, &RouteUI::monitor_disk_release));
 
-	BusSendDisplayChanged.connect (*this, invalidator (*this), boost::bind(&RouteUI::bus_send_display_changed, this, _1), gui_context());
+	BusSendDisplayChanged.connect_same_thread (*this, boost::bind(&RouteUI::bus_send_display_changed, this, _1));
 }
 
 void