Fixed move logic.

Author: redboltz

include/mqtt/endpoint.hpp

@@ -10547,7 +10547,8 @@ class endpoint : public std::enable_shared_from_this<endpoint<Mutex, LockGuard,
         async_handler_t func
     ) {
         auto do_async_send_publish =
-            [&](auto msg, auto&& serialize_publish, auto&& receive_maximum_proc) {
+            [&, func = force_move(func)]
+            (auto msg, auto&& serialize_publish, auto&& receive_maximum_proc) mutable {
                 auto msg_lk = apply_topic_alias(msg, life_keeper);
                 if (maximum_packet_size_send_ < size<PacketIdBytes>(std::get<0>(msg_lk))) {
                     if (packet_id != 0) {
@@ -10565,7 +10566,13 @@ class endpoint : public std::enable_shared_from_this<endpoint<Mutex, LockGuard,
                         msg,
                         life_keeper,
                         std::forward<decltype(serialize_publish)>(serialize_publish),
-                        std::forward<decltype(receive_maximum_proc)>(receive_maximum_proc)
+                        [
+                            &func,
+                            receive_maximum_proc = std::forward<decltype(receive_maximum_proc)>(receive_maximum_proc)
+                        ]
+                        (auto&& msg) mutable {
+                            return receive_maximum_proc(force_move(msg), func);
+                        }
                     )
                 ) {
                     do_async_write(
@@ -10587,7 +10594,7 @@ class endpoint : public std::enable_shared_from_this<endpoint<Mutex, LockGuard,
                     pubopts
                 ),
                 &endpoint::on_serialize_publish_message,
-                [] (auto&&) { return true; }
+                [] (auto&&, async_handler_t&) { return true; }
             );
             break;
         case protocol_version::v5:
@@ -10600,7 +10607,7 @@ class endpoint : public std::enable_shared_from_this<endpoint<Mutex, LockGuard,
                     force_move(props)
                 ),
                 &endpoint::on_serialize_v5_publish_message,
-                [this, func = force_move(func)] (v5::basic_publish_message<PacketIdBytes>&& msg) mutable {
+                [this] (v5::basic_publish_message<PacketIdBytes>&& msg, async_handler_t& func) mutable {
                     if (publish_send_count_.load() == publish_send_max_) {
                         {
                             LockGuard<Mutex> lck (publish_send_queue_mtx_);

test/system/st_offline.cpp

@@ -545,12 +545,12 @@ BOOST_AUTO_TEST_CASE( async_publish_qos1 ) {
                             "topic1",
                             "topic1_contents",
                             MQTT_NS::qos::at_least_once  | MQTT_NS::retain::no,
-                            [&chk](MQTT_NS::error_code ec){
+                            [&](MQTT_NS::error_code ec){
                                 BOOST_TEST( ! ec);
                                 MQTT_CHK("h_pub_finish");
+                                async_connect_no_clean(c);
                             }
                         );
-                        async_connect_no_clean(c);
                     },
                     [&] {
                         MQTT_CHK("h_close2");