connection: Take the slot_base directly, without the intermediate slot_iterator.

1 files changed, 6 insertions, 4 deletions

diff --git a/sigc++/connection.cc b/sigc++/connection.cc
index 58c2fe5..bbcfcb7 100644
--- a/sigc++/connection.cc
+++ b/sigc++/connection.cc
@@ -26,17 +26,19 @@ connection::connection() noexcept : slot_(nullptr)
 {
 }
 
-connection::connection(const connection& c) : slot_(c.slot_)
+connection::connection(slot_base* slot)
+: slot_(slot)
 {
-  // Let the connection forget about the signal handler when the handler object dies:
   if (slot_)
     slot_->add_destroy_notify_callback(this, &notify);
 }
 
-connection::connection(slot_base& sl) : slot_(&sl)
+
+connection::connection(const connection& c) : slot_(c.slot_)
 {
   // Let the connection forget about the signal handler when the handler object dies:
-  slot_->add_destroy_notify_callback(this, &notify);
+  if (slot_)
+    slot_->add_destroy_notify_callback(this, &notify);
 }
 
 connection&