aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/java/sip/communicator/impl
diff options
context:
space:
mode:
authordamencho <damencho@jitsi.org>2015-07-28 14:53:42 -0500
committerdamencho <damencho@jitsi.org>2015-07-28 14:53:42 -0500
commitfd07a350db8a3184f39c1d0972456fc4e7b9629f (patch)
treebaddac16dc96d9fd4c5d617dbd3dcc51e69a89cc /src/net/java/sip/communicator/impl
parentdfe9388425dcdcad79194a52c76c2a4481d855c7 (diff)
downloadjitsi-fd07a350db8a3184f39c1d0972456fc4e7b9629f.zip
jitsi-fd07a350db8a3184f39c1d0972456fc4e7b9629f.tar.gz
jitsi-fd07a350db8a3184f39c1d0972456fc4e7b9629f.tar.bz2
Fixes possible NPE, peer going from failed to connected and a dispatching of a DialogTerminatedEvent (fixes damencho/jigasi#5 issue).
Diffstat (limited to 'src/net/java/sip/communicator/impl')
-rw-r--r--src/net/java/sip/communicator/impl/protocol/sip/CallPeerSipImpl.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/CallPeerSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/CallPeerSipImpl.java
index d9d19d3..d8f46cd 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/CallPeerSipImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/CallPeerSipImpl.java
@@ -858,8 +858,11 @@ public class CallPeerSipImpl
// as its connected, set initial mute status,
// corresponding call status
- if(isMute() != this.getCall().isMute())
+ if (this.getCall() != null
+ && isMute() != this.getCall().isMute())
+ {
setMute(this.getCall().isMute());
+ }
}
fireResponseProcessed(ok, null);