From 9fc08acb4298259e1d6bab0bd2c0aacc05296db1 Mon Sep 17 00:00:00 2001
From: Ingo Bauersachs <ingo@jitsi.org>
Date: Thu, 6 Oct 2011 10:10:06 +0000
Subject: [PATCH] Ignore multistream starts from the same controller

---
 .../java/sip/communicator/impl/neomedia/ZrtpControlImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/net/java/sip/communicator/impl/neomedia/ZrtpControlImpl.java b/src/net/java/sip/communicator/impl/neomedia/ZrtpControlImpl.java
index 01222e003..70f6de6ab 100644
--- a/src/net/java/sip/communicator/impl/neomedia/ZrtpControlImpl.java
+++ b/src/net/java/sip/communicator/impl/neomedia/ZrtpControlImpl.java
@@ -209,7 +209,7 @@ public void start(boolean masterSession)
      */
     public void setMultistream(SrtpControl master)
     {
-        if(master == null)
+        if(master == null || master == this)
             return;
 
         if(!(master instanceof ZrtpControlImpl))