OSC is now driven by an event loop; fix up lifetime mgmt of Glib::Source to workaround bug in Glib

git-svn-id: svn://localhost/ardour2/branches/3.0@6329 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 11 insertions, 1 deletions

diff --git a/libs/pbd/pbd/crossthread.h b/libs/pbd/pbd/crossthread.h
index f2fb4aa469..7a323e198f 100644
--- a/libs/pbd/pbd/crossthread.h
+++ b/libs/pbd/pbd/crossthread.h
@@ -33,11 +33,21 @@ class CrossThreadChannel {
 	void drain ();
 	static void drain (int fd);
 
+	/* glibmm 2.22 and earlier has a terrifying bug that will
+	   cause crashes whenever a Source is removed from
+	   a MainContext (including the destruction of the MainContext),
+	   because the Source is destroyed "out from under the nose of" 
+	   the RefPtr. I (Paul) have fixed this (https://bugzilla.gnome.org/show_bug.cgi?id=561885)
+	   but in the meantime, we need a hack to get around the issue.
+	*/
+
 	Glib::RefPtr<Glib::IOSource> ios();
+	void drop_ios ();
+
 	bool ok() const { return fds[0] >= 0 && fds[1] >= 0; }
 
   private:
-	Glib::RefPtr<Glib::IOSource> _ios; // lazily constructed
+	Glib::RefPtr<Glib::IOSource>* _ios; // lazily constructed
 	int fds[2];
 };