aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBoris Grozev <boris@jitsi.org>2013-08-15 11:21:54 +0300
committerBoris Grozev <boris@jitsi.org>2013-08-15 11:45:03 +0300
commit9c84a3f8cb4ce66555ed3ccb8097027e365d476b (patch)
tree5b93e11426fe9ed37823538f1d21abc9e0001a81
parent4d870d6b21e324ce743b0aabde2ba80e630dadf7 (diff)
downloadjitsi-9c84a3f8cb4ce66555ed3ccb8097027e365d476b.zip
jitsi-9c84a3f8cb4ce66555ed3ccb8097027e365d476b.tar.gz
jitsi-9c84a3f8cb4ce66555ed3ccb8097027e365d476b.tar.bz2
Make sure that video content is added, if necessary, after a peer is put off hold.
-rw-r--r--src/net/java/sip/communicator/impl/protocol/jabber/CallPeerJabberImpl.java15
1 files changed, 15 insertions, 0 deletions
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/CallPeerJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/CallPeerJabberImpl.java
index 9e5ee8e..72c7900 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/CallPeerJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/CallPeerJabberImpl.java
@@ -1343,6 +1343,7 @@ public class CallPeerJabberImpl
@Override
public void setState(CallPeerState newState, String reason, int reasonCode)
{
+ CallPeerState oldState = getState();
try
{
/*
@@ -1359,6 +1360,20 @@ public class CallPeerJabberImpl
{
super.setState(newState, reason, reasonCode);
}
+
+ if (CallPeerState.isOnHold(oldState)
+ && CallPeerState.CONNECTED.equals(newState))
+ {
+ try
+ {
+ getCall().modifyVideoContent();
+ }
+ catch (OperationFailedException ofe)
+ {
+ logger.error("Failed to update call video state after " +
+ "'hold' status removed for "+this);
+ }
+ }
}
/**