From 4379e991c6094cce7bb2f9c27a485888844ffe25 Mon Sep 17 00:00:00 2001
From: Matt Broadstone <mbroadstone@devonit.com>
Date: Fri, 27 Feb 2015 08:16:22 -0500
Subject: [PATCH] properly tune heartbeat delay

tuneOk was only properly tuning the heartbeat delay value for values
larger than the default delay sent by the server. This changes that
behavior to send back the requested heartbeat delay if one was provided
---
 src/qamqpclient.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/qamqpclient.cpp b/src/qamqpclient.cpp
index 0ccfef8..68916d2 100644
--- a/src/qamqpclient.cpp
+++ b/src/qamqpclient.cpp
@@ -402,7 +402,7 @@ void QAmqpClientPrivate::tune(const QAmqpMethodFrame &frame)
     if (!frameMax)
         frameMax = frame_max;
     channelMax = !channelMax ? channel_max : qMax(channel_max, channelMax);
-    heartbeatDelay = !heartbeatDelay ? heartbeat_delay: qMax(heartbeat_delay, heartbeatDelay);
+    heartbeatDelay = !heartbeatDelay ? heartbeat_delay: heartbeatDelay;
 
     qAmqpDebug(">> channel_max: %d", channelMax);
     qAmqpDebug(">> frame_max: %d", frameMax);