fix crash when copy'ing latent plugins

[ardour.git] / libs / ardour / port.cc

diff --git a/libs/ardour/port.cc b/libs/ardour/port.cc
index dcb3e2ff4a24577bae5c1eaf0215dd7237c13cbb..33b41f5c046e40dd05a23a97ea1afd494a712378 100644 (file)
--- a/libs/ardour/port.cc
+++ b/libs/ardour/port.cc
@@ -30,7 +30,7 @@
 #include "ardour/port.h"
 #include "ardour/port_engine.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -38,6 +38,7 @@ using namespace PBD;
 
 PBD::Signal2<void,boost::shared_ptr<Port>, boost::shared_ptr<Port> > Port::PostDisconnect;
 PBD::Signal0<void> Port::PortDrop;
+PBD::Signal0<void> Port::PortSignalDrop;
 
 bool         Port::_connecting_blocked = false;
 pframes_t    Port::_global_port_buffer_offset = 0;
@@ -75,6 +76,7 @@ Port::Port (std::string const & n, DataType t, PortFlags f)
        }
 
        PortDrop.connect_same_thread (drop_connection, boost::bind (&Port::drop, this));
+       PortSignalDrop.connect_same_thread (drop_connection, boost::bind (&Port::signal_drop, this));
        port_manager->PortConnectedOrDisconnected.connect_same_thread (engine_connection,
                        boost::bind (&Port::port_connected_or_disconnected, this, _1, _3, _5));
 }
@@ -118,6 +120,12 @@ Port::set_pretty_name(const std::string& n)
        return false;
 }
 
+void
+Port::signal_drop ()
+{
+       engine_connection.disconnect ();
+}
+
 void
 Port::drop ()
 {
@@ -579,7 +587,7 @@ Port::get_state () const
 int
 Port::set_state (const XMLNode& node, int)
 {
-       const XMLProperty* prop;
+       XMLProperty const * prop;
 
        if (node.name() != state_node_name) {
                return -1;