Merge "Merge remote-tracking branch 'origin/5.13' into dev"

1 files changed, 10 insertions, 3 deletions

diff --git a/src/coap/qcoapprotocol.cpp b/src/coap/qcoapprotocol.cpp
index 30ee188..42ef4ba 100644
--- a/src/coap/qcoapprotocol.cpp
+++ b/src/coap/qcoapprotocol.cpp
@@ -180,10 +180,17 @@ void QCoapProtocol::sendRequest(QPointer<QCoapReply> reply, QCoapConnection *con
             internalRequest->setToSendBlock(0, d->blockSize);
     }
 
-    if (requestMessage->type() == QCoapMessage::Type::Confirmable)
-        internalRequest->setTimeout(QtCoap::randomGenerator().bounded(minimumTimeout(), maximumTimeout()));
-    else
+    if (requestMessage->type() == QCoapMessage::Type::Confirmable) {
+        const auto minTimeout = minimumTimeout();
+        const auto maxTimeout = maximumTimeout();
+        Q_ASSERT(minTimeout <= maxTimeout);
+
+        internalRequest->setTimeout(minTimeout == maxTimeout
+                                    ? minTimeout
+                                    : QtCoap::randomGenerator().bounded(minTimeout, maxTimeout));
+    } else {
         internalRequest->setTimeout(maximumTimeout());
+    }
 
     connect(internalRequest.data(), &QCoapInternalRequest::timeout,
             [this](QCoapInternalRequest *request) {