open_source / mqtt-cpp

Commit 7702feecbe3c3f4ad0ef98143643b827e0a1f94b

Authored by Steven de Ridder
2 parents c001bf96 46a66fbb

Merge branch 'master' into 'development' 

Master

See merge request !18
Inline Side-by-side
Showing 1 changed file with 4 additions and 2 deletions
src/clientpaho.cpp
  View file @7702fee
@@ -377,10 +377,10 @@ std::int32_t ClientPaho::publish( const MqttMessage& message, int qos ) @@ -377,10 +377,10 @@ std::int32_t ClientPaho::publish( const MqttMessage& message, int qos )
377 } 377 }
378 378
379 std::unique_lock<std::mutex> lck(m_mutex); 379 std::unique_lock<std::mutex> lck(m_mutex);
380 - if( ConnectionStatus::ReconnectInProgress == m_connectionStatus || m_processPendingPublishes ) 380 + if( ConnectionStatus::Connected != m_connectionStatus || m_processPendingPublishes )
381 { 381 {
382 m_pendingPublishesReadyCV.wait(lck, [this]() { return !m_processPendingPublishes; }); 382 m_pendingPublishesReadyCV.wait(lck, [this]() { return !m_processPendingPublishes; });
383 - if( ConnectionStatus::ReconnectInProgress == m_connectionStatus ) 383 + if( ConnectionStatus::Connected != m_connectionStatus )
384 { 384 {
385 LogDebug( "[ClientPaho::publish]", "Adding publish to pending queue." ); 385 LogDebug( "[ClientPaho::publish]", "Adding publish to pending queue." );
386 m_pendingPublishes.push_front( Publish{ qos, message } ); 386 m_pendingPublishes.push_front( Publish{ qos, message } );
@@ -789,6 +789,8 @@ void ClientPaho::onConnectOnInstance( const std::string&amp; cause ) @@ -789,6 +789,8 @@ void ClientPaho::onConnectOnInstance( const std::string&amp; cause )
789 789
790 void ClientPaho::onConnectSuccessOnInstance() 790 void ClientPaho::onConnectSuccessOnInstance()
791 { 791 {
  792 + m_processPendingPublishes = true;
  793 +
792 LogDebug( "[ClientPaho::onConnectSuccessOnInstance]", 794 LogDebug( "[ClientPaho::onConnectSuccessOnInstance]",
793 std::string( m_clientId + " - onConnectSuccessOnInstance triggered." ) ); 795 std::string( m_clientId + " - onConnectSuccessOnInstance triggered." ) );
794 { 796 {