diff options
| author | Boris Grozev <boris@jitsi.org> | 2013-06-22 10:13:19 +0300 |
|---|---|---|
| committer | Boris Grozev <boris@jitsi.org> | 2013-06-22 10:13:19 +0300 |
| commit | 176fe3587016a5b04de0cd0080264c444040ffad (patch) | |
| tree | 9bd706381630030e83dce09b6713c0f495141849 /src/net/java/sip/communicator/impl/protocol/jabber/OperationSetTelephonyConferencingJabberImpl.java | |
| parent | b540821ac438ff2718b33a9b37772ec8137dfac5 (diff) | |
| download | jitsi-176fe3587016a5b04de0cd0080264c444040ffad.zip jitsi-176fe3587016a5b04de0cd0080264c444040ffad.tar.gz jitsi-176fe3587016a5b04de0cd0080264c444040ffad.tar.bz2 | |
Small bug fixes
Diffstat (limited to 'src/net/java/sip/communicator/impl/protocol/jabber/OperationSetTelephonyConferencingJabberImpl.java')
| -rw-r--r-- | src/net/java/sip/communicator/impl/protocol/jabber/OperationSetTelephonyConferencingJabberImpl.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetTelephonyConferencingJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetTelephonyConferencingJabberImpl.java index 5e55615..6da2fe6 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetTelephonyConferencingJabberImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetTelephonyConferencingJabberImpl.java @@ -171,8 +171,12 @@ public class OperationSetTelephonyConferencingJabberImpl ConferenceInfoDocument lastSentConfInfo = callPeerJabber.getLastConferenceInfoSent(); - ConferenceInfoDocument diff - = getConferenceInfoDiff(lastSentConfInfo, currentConfInfo); + ConferenceInfoDocument diff; + + if (lastSentConfInfo == null) + diff = currentConfInfo; + else + diff = getConferenceInfoDiff(lastSentConfInfo, currentConfInfo); if (diff != null) { |