commit d5545233afa6fff3c18d51d2ab6e2520a177bcd0
author Alexandre Lision <alexandre.lision@savoirfairelinux.com> Tue Oct 29 11:24:02 2013 -0400
committer Alexandre Lision <alexandre.lision@savoirfairelinux.com> Tue Oct 29 11:24:02 2013 -0400
tree 6cd64ced4c8349ac79303668b8ebbacb967dba2b
parent d568603c7c82fe869981293c739213d9006706ae

* #33708: fixed im crash in Conference

src/org/sflphone/service/SipService.java

diff --git a/src/org/sflphone/service/SipService.java b/src/org/sflphone/service/SipService.java
index 29f8df6..8f3f2d4 100644
--- a/src/org/sflphone/service/SipService.java
+++ b/src/org/sflphone/service/SipService.java
@@ -1022,7 +1022,10 @@
                 protected void doRun() throws SameThreadException, RemoteException {
                     Log.i(TAG, "SipService.sendTextMessage() thread running...");
                     callManagerJNI.sendTextMessage(callID, message.comment);
-                    getCurrent_calls().get(callID).addSipMessage(message);
+                    if(getCurrent_calls().get(callID) != null)
+                        getCurrent_calls().get(callID).addSipMessage(message);
+                    else if(getCurrent_confs().get(callID) != null)
+                        getCurrent_confs().get(callID).addSipMessage(message);
                 }
             });