Merge branch 'master' into lash

dbus/controller_iface_patchbay.c

@@ -423,7 +423,7 @@ jack_controller_patchbay_new_port(
     const char *port_short_name;
     size_t client_name_len;
 
-    //jack_info("name: %s", port_full_name);
+    //jack_info("new port: %s", port_full_name);
 
     port_short_name = strchr(port_full_name, ':');
     if (port_short_name == NULL)
@@ -489,6 +489,8 @@ jack_controller_patchbay_remove_port(
     struct jack_controller_patchbay *patchbay_ptr,
     struct jack_graph_port *port_ptr)
 {
+    //jack_info("remove port: %s", port_ptr->name);
+
     pthread_mutex_lock(&patchbay_ptr->lock);
     list_del(&port_ptr->siblings_client);
     list_del(&port_ptr->siblings_graph);
@@ -1350,14 +1352,14 @@ jack_controller_dbus_disconnect_ports_by_id(
     if (port1_ptr == NULL)
     {
         jack_dbus_error(call, JACK_DBUS_ERROR_INVALID_ARGS, "cannot find port %" PRIu64, port1_id);
-        return;
+        goto unlock;
     }
 
     port2_ptr = jack_controller_patchbay_find_port_by_id(patchbay_ptr, port2_id);
     if (port2_ptr == NULL)
     {
         jack_dbus_error(call, JACK_DBUS_ERROR_INVALID_ARGS, "cannot find port %" PRIu64, port2_id);
-        return;
+        goto unlock;
     }
 
     if (!jack_controller_patchbay_disconnect(