From 84ddec118d33d244c5985a09ee66aead5826ce34 Mon Sep 17 00:00:00 2001
From: paul <paul@d708f5d6-7413-0410-9779-e7cbd77b26cf>
Date: Wed, 19 Jan 2011 18:58:50 +0000
Subject: [PATCH] check that we're still connected to JACK when using
 jack_port_get_connections()

git-svn-id: http://subversion.ardour.org/svn/ardour2/ardour2/branches/3.0@8543 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 libs/ardour/port.cc | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/libs/ardour/port.cc b/libs/ardour/port.cc
index fe234c593..2a89560b7 100644
--- a/libs/ardour/port.cc
+++ b/libs/ardour/port.cc
@@ -91,6 +91,14 @@ Port::disconnect_all ()
 bool
 Port::connected_to (std::string const & o) const
 {
+        if (!_engine->connected()) {
+                /* in some senses, this answer isn't the right one all the time, 
+                   because we know about our connections and will re-establish
+                   them when we reconnect to JACK.
+                */
+                return false;
+        }
+
 	return jack_port_connected_to (_jack_port, _engine->make_port_name_non_relative(o).c_str ());
 }
 
@@ -100,15 +108,17 @@ Port::get_connections (std::vector<std::string> & c) const
 {
 	int n = 0;
 
-	const char** jc = jack_port_get_connections (_jack_port);
-	if (jc) {
-		for (int i = 0; jc[i]; ++i) {
-			c.push_back (jc[i]);
-			++n;
-		}
-
-		jack_free (jc);
-	}
+        if (_engine->connected()) {
+                const char** jc = jack_port_get_connections (_jack_port);
+                if (jc) {
+                        for (int i = 0; jc[i]; ++i) {
+                                c.push_back (jc[i]);
+                                ++n;
+                        }
+                        
+                        jack_free (jc);
+                }
+        }
 
 	return n;
 }
-- 
2.11.4.GIT