diff options
| author | scmerger <scmerger@java.net> | 2009-07-01 06:27:56 +0000 |
|---|---|---|
| committer | scmerger <scmerger@java.net> | 2009-07-01 06:27:56 +0000 |
| commit | f6363c99a445c6eb644f6e4599f03ca8463751ad (patch) | |
| tree | 651ece8ddee1c7977ae77ee7e332d9e55c272b1f /src/net/java/sip | |
| parent | 532ae2f11b7f6302d89da123716387f4ef0644af (diff) | |
| download | jitsi-f6363c99a445c6eb644f6e4599f03ca8463751ad.zip jitsi-f6363c99a445c6eb644f6e4599f03ca8463751ad.tar.gz jitsi-f6363c99a445c6eb644f6e4599f03ca8463751ad.tar.bz2 | |
Merge branch '1.0-local' into trunk-local
* 1.0-local:
Makes sure that we always remove targets when reinitializing rtp
Fix yahoo login problems with strange chars in password.
Diffstat (limited to 'src/net/java/sip')
| -rw-r--r-- | src/net/java/sip/communicator/impl/media/CallSessionImpl.java | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/net/java/sip/communicator/impl/media/CallSessionImpl.java b/src/net/java/sip/communicator/impl/media/CallSessionImpl.java index f130543..22e52fe 100644 --- a/src/net/java/sip/communicator/impl/media/CallSessionImpl.java +++ b/src/net/java/sip/communicator/impl/media/CallSessionImpl.java @@ -451,7 +451,7 @@ public class CallSessionImpl if(!startedAtLeastOneAudioStream && !startedAtLeastOneVideoStream - && sendStreams != null + && sendStreams != null && (sendStreams.size() > 0)) { stopStreaming(); @@ -1616,14 +1616,10 @@ public class CallSessionImpl { allocateMediaPorts = true; } - else if ((intendedDestination != null) - && !intendedDestination.equals(lastIntendedDestination)) + else if ((intendedDestination != null)) { + //we already have ongoing streams so we kill them stopStreaming(false); - //audioRtpManager = RTPManager.newInstance(); - //videoRtpManager = RTPManager.newInstance(); - - //allocateMediaPorts = true; } if (allocateMediaPorts) { |