Fix disconnect by slot when slot is wrapped in a

boost::reference_wrapper
boostorg · Dec 30, 2023 · 4d994bb · 4d994bb
1 parent 2ba258f
commit 4d994bb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/include/boost/signals2/detail/signal_template.hpp b/include/boost/signals2/detail/signal_template.hpp
@@ -223,7 +223,7 @@ namespace boost
         void disconnect(const T &slot)
         {
           typedef mpl::bool_<(is_convertible<T, group_type>::value)> is_group;
-          do_disconnect(slot, is_group());
+          do_disconnect(unwrap_ref(slot), is_group());
         }
         // emit signal
         result_type operator ()(BOOST_SIGNALS2_SIGNATURE_FULL_ARGS(BOOST_SIGNALS2_NUM_ARGS))

diff --git a/test/signal_test.cpp b/test/signal_test.cpp
@@ -166,6 +166,12 @@ test_signal_signal_connect()
     s1.disconnect(s2);
     BOOST_CHECK(s1(3) == -3);
 
+    // disconnect by reference wrapped slot
+    s1.connect(s2);
+    BOOST_CHECK(s1(3) == 6);
+    s1.disconnect(boost::ref(s2));
+    BOOST_CHECK(s1(3) == -3);
+
     // reconnect s2 to test auto-disconnect on destruction
     s1.connect(s2);
     BOOST_CHECK(s1(3) == 6);