aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/java
diff options
context:
space:
mode:
authorDamian Minkov <damencho@jitsi.org>2010-05-04 09:30:31 +0000
committerDamian Minkov <damencho@jitsi.org>2010-05-04 09:30:31 +0000
commit44aee39944c42211a472a265478c09dabf014bea (patch)
tree1eae8633f4f5fd7eaa4f7bf465f0d59dd9c39a72 /src/net/java
parent335d060101fb02a5dacf134ee64707bd5b9411b8 (diff)
downloadjitsi-44aee39944c42211a472a265478c09dabf014bea.zip
jitsi-44aee39944c42211a472a265478c09dabf014bea.tar.gz
jitsi-44aee39944c42211a472a265478c09dabf014bea.tar.bz2
Fix hold/unhold when there is no video device selected.
Diffstat (limited to 'src/net/java')
-rw-r--r--src/net/java/sip/communicator/impl/protocol/sip/CallPeerMediaHandler.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/CallPeerMediaHandler.java b/src/net/java/sip/communicator/impl/protocol/sip/CallPeerMediaHandler.java
index 5ed88e7..5bffcf5 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/CallPeerMediaHandler.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/CallPeerMediaHandler.java
@@ -505,7 +505,8 @@ public class CallPeerMediaHandler
.or(MediaDirection.SENDONLY));
audioStream.setMute(locallyOnHold);
}
- if(videoStream != null)
+ if(videoStream != null
+ && videoStream.getDirection() != MediaDirection.INACTIVE)
{
videoStream.setDirection(videoStream.getDirection()
.or(MediaDirection.SENDONLY));