Don't use old session connections on MCP device change, Solves crash on device change.

1 files changed, 6 insertions, 4 deletions

diff --git a/libs/surfaces/mackie/surface.cc b/libs/surfaces/mackie/surface.cc
index 005f1fadb2..a7ba8406a5 100644
--- a/libs/surfaces/mackie/surface.cc
+++ b/libs/surfaces/mackie/surface.cc
@@ -270,10 +270,12 @@ Surface::set_state (const XMLNode& node, int version)
 		return 0;
 	}
 
-	XMLNode* portnode = mynode->child (X_("Port"));
-	if (portnode) {
-		if (_port->set_state (*portnode, version)) {
-			return -1;
+	if (_mcp.session_load ()) {
+		XMLNode* portnode = mynode->child (X_("Port"));
+		if (portnode) {
+			if (_port->set_state (*portnode, version)) {
+				return -1;
+			}
 		}
 	}