From 5901b49b3f6b8d6f7d09678e34226a7f06311482 Mon Sep 17 00:00:00 2001
From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Mon, 24 Aug 2015 16:45:14 +0200
Subject: don't send triggered check if one is in progress

---
 src/base/QXmppStun.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/base/QXmppStun.cpp')

diff --git a/src/base/QXmppStun.cpp b/src/base/QXmppStun.cpp
index 987e040f..cd51b46f 100644
--- a/src/base/QXmppStun.cpp
+++ b/src/base/QXmppStun.cpp
@@ -2204,7 +2204,9 @@ void QXmppIceComponent::handleDatagram(const QByteArray &buffer, const QHostAddr
             pair->checked |= QIODevice::ReadOnly;
         }
 
-        if (!d->iceControlling && pair->state() != CandidatePair::SucceededState && !d->remoteUser.isEmpty())
+        if (!d->remoteUser.isEmpty()
+         && pair->state() != CandidatePair::InProgressState
+         && pair->state() != CandidatePair::SucceededState)
         {
             // send a triggered connectivity test
             QXmppStunMessage message;
@@ -2213,8 +2215,6 @@ void QXmppIceComponent::handleDatagram(const QByteArray &buffer, const QHostAddr
             message.setPriority(d->peerReflexivePriority);
             message.setUsername(QString("%1:%2").arg(d->remoteUser, d->localUser));
             message.iceControlled = d->tieBreaker;
-            if (pair->transaction)
-                pair->transaction->deleteLater();
             pair->setState(CandidatePair::InProgressState);
             pair->transaction = new QXmppStunTransaction(message, this);
         }
-- 
cgit v1.2.3