also push to queue if connectInProgress.

Queue is only correctly unloaded in onConnect. it does not seem to be unloaded on onFirstConnect, only when changing pushIncomingEvent. should investigate.

also push to queue if connectInProgress.
Queue is only correctly unloaded in onConnect. it does not seem to be unloaded on onFirstConnect, only when changing pushIncomingEvent. should investigate.
Steven
1 parent 1ffaa75b
Showing 1 changed file with 4 additions and 3 deletions
src/clientpaho.cpp
@@ -377,10 +377,10 @@ std::int32_t ClientPaho::publish( const MqttMessage&amp; message, int qos )
     }
     std::unique_lock<std::mutex> lck(m_mutex);
-    if( ConnectionStatus::ReconnectInProgress == m_connectionStatus || m_processPendingPublishes )
+    if( ConnectionStatus::ReconnectInProgress == m_connectionStatus || ConnectionStatus::ConnectInProgress == m_connectionStatus || m_processPendingPublishes )
     {
         m_pendingPublishesReadyCV.wait(lck, [this]() { return !m_processPendingPublishes; });
-        if( ConnectionStatus::ReconnectInProgress == m_connectionStatus )
+        if( ConnectionStatus::ReconnectInProgress == m_connectionStatus || ConnectionStatus::ConnectInProgress == m_connectionStatus )
         {
             LogDebug( "[ClientPaho::publish]", "Adding publish to pending queue." );
             m_pendingPublishes.push_front( Publish{ qos, message } );
@@ -1127,7 +1127,8 @@ void ClientPaho::onFirstConnect( void* context, char* cause )
     {
         auto *cl = reinterpret_cast<ClientPaho*>( context );
         std::string reason( nullptr == cause ? "Unknown cause" : cause );
-        cl->pushIncomingEvent( [cl, reason]() { cl->onConnectSuccessOnInstance(); } );
+        //cl->pushIncomingEvent( [cl, reason]() { cl->onConnectSuccessOnInstance(); } );
+        cl->pushIncomingEvent( [cl, reason]() { cl->onConnectOnInstance( reason ); } );
     }
 }