From 45775fefe829a895552e1e2e4e968f1fb26aa504 Mon Sep 17 00:00:00 2001
From: Emiel Bruijntjes <emiel.bruijntjes@copernica.com>
Date: Tue, 15 Jun 2021 11:56:56 +0200
Subject: [PATCH] avoid that multiple frames are sent by the channel-on-ready
 handler

---
 include/amqpcpp/channelimpl.h | 10 ++--------
 src/channelimpl.cpp           |  4 ++--
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/include/amqpcpp/channelimpl.h b/include/amqpcpp/channelimpl.h
index 5c53bbf6..82bc9273 100644
--- a/include/amqpcpp/channelimpl.h
+++ b/include/amqpcpp/channelimpl.h
@@ -617,20 +617,14 @@ class ChannelImpl : public Watchable, public std::enable_shared_from_this<Channe
      */
     void reportReady()
     {
-        // callbacks could destroy us, so monitor it
-        Monitor monitor(this);
-
         // if we are still in connected state we are now ready
         if (_state == state_connected) _state = state_ready;
         
-        // the last (possibly synchronous) operation was received, so we're no longer in synchronous mode
-        if (_synchronous && _queue.empty()) _synchronous = false;
+        // send out more instructions if there is a queue
+        flush();
 
         // inform handler
         if (_readyCallback) _readyCallback();
-
-        // if the monitor is still valid, we flush any waiting operations 
-        if (monitor.valid()) flush();
     }
 
     /**
diff --git a/src/channelimpl.cpp b/src/channelimpl.cpp
index 0bd77350..5b185c7a 100644
--- a/src/channelimpl.cpp
+++ b/src/channelimpl.cpp
@@ -747,7 +747,7 @@ bool ChannelImpl::send(CopiedBuffer &&frame)
     
     // are we currently in synchronous mode or are there
     // other frames waiting for their turn to be sent?
-    if (_synchronous || !_queue.empty())
+    if (waiting())
     {
         // we need to wait until the synchronous frame has
         // been processed, so queue the frame until it was
@@ -786,7 +786,7 @@ bool ChannelImpl::send(const Frame &frame)
     
     // are we currently in synchronous mode or are there
     // other frames waiting for their turn to be sent?
-    if (_synchronous || !_queue.empty())
+    if (waiting())
     {
         // we need to wait until the synchronous frame has
         // been processed, so queue the frame until it was