aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/xmpp
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-04-26 17:26:22 +0200
committerDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-04-26 17:26:22 +0200
commit4b66b4b5d1c6376c964d1f252b813ba21b80a64d (patch)
tree0ba9cf4c8fce8fe2b6d88746a7c6724da2afbd12 /src/eu/siacs/conversations/xmpp
parentf36f2184698b2c0dc7ace4073ed018cdf3122b5b (diff)
bug fix for jingle
Diffstat (limited to 'src/eu/siacs/conversations/xmpp')
-rw-r--r--src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java b/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
index 4f383f52..bcf75c0c 100644
--- a/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
+++ b/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
@@ -381,7 +381,7 @@ public class JingleConnection {
} else if (content.socks5transport().hasChild("candidate-error")) {
Log.d("xmppService","received candidate error");
this.receivedCandidate = true;
- if (status == STATUS_ACCEPTED) {
+ if ((status == STATUS_ACCEPTED)&&(this.sentCandidate)) {
this.connect();
}
} else if (content.socks5transport().hasChild("candidate-used")){