From b03f7b486a4b7a3a9ed83712fb7e7ced9f988c47 Mon Sep 17 00:00:00 2001
From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Sat, 23 Apr 2011 15:49:58 +0000
Subject: * when closing an ICE connection, disable active pair * when already
 ICE is already connecting/connected, make connectToHost() a no-op

---
 src/QXmppStun.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/QXmppStun.cpp')

diff --git a/src/QXmppStun.cpp b/src/QXmppStun.cpp
index 95a04ba8..45d55220 100644
--- a/src/QXmppStun.cpp
+++ b/src/QXmppStun.cpp
@@ -1694,6 +1694,7 @@ void QXmppIceComponent::close()
     m_turnAllocation->disconnectFromHost();
     m_timer->stop();
     m_stunTimer->stop();
+    m_activePair = 0;
 }
 
 /// Starts ICE connectivity checks.
@@ -2408,6 +2409,9 @@ void QXmppIceConnection::close()
 
 void QXmppIceConnection::connectToHost()
 {
+    if (isConnected() || m_connectTimer->isActive())
+        return;
+
     foreach (QXmppIceComponent *socket, m_components.values())
         socket->connectToHost();
     m_connectTimer->start();
-- 
cgit v1.2.3