From d13efcc019e2f2f22bedb6c9dee98a7e7042547f Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Fri, 12 Jan 2018 11:00:44 +0100
Subject: [PATCH] Guarding against nulls

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 .../java/com/nextcloud/talk/activities/CallActivity.java | 9 +++++++--
 1 file changed, 7 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 aa25b74a4..d04f594f3 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
@@ -993,8 +993,13 @@ public class CallActivity extends AppCompatActivity {
                 localMediaStream.dispose();
             }
 
-            localVideoTrack.dispose();
-            localAudioTrack.dispose();
+            if (localVideoTrack != null) {
+                localVideoTrack.dispose();
+            }
+
+            if (localAudioTrack != null) {
+                localAudioTrack.dispose();
+            }
 
             localVideoTrack = null;
             localAudioTrack = null;