From 0d8716248d1d9d2ed037db604d34c20812594423 Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Fri, 26 Jan 2018 00:27:06 +0100
Subject: [PATCH] Protect against crash

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 .../java/com/nextcloud/talk/activities/CallActivity.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
index 155c8fd2e..2ef967efb 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
@@ -945,8 +945,10 @@ public class CallActivity extends AppCompatActivity {
                                     SessionDescription.Type.fromCanonicalForm(type),
                                     sessionDescriptionStringWithPreferredCodec);
 
-                            magicPeerConnectionWrapper.getPeerConnection().setRemoteDescription(magicPeerConnectionWrapper
-                                    .getMagicSdpObserver(), sessionDescriptionWithPreferredCodec);
+                            if (magicPeerConnectionWrapper.getPeerConnection() != null) {
+                                magicPeerConnectionWrapper.getPeerConnection().setRemoteDescription(magicPeerConnectionWrapper
+                                        .getMagicSdpObserver(), sessionDescriptionWithPreferredCodec);
+                            }
                             break;
                         case "candidate":
                             NCIceCandidate ncIceCandidate = ncSignalingMessage.getPayload().getIceCandidate();