From bebb95b7f8b78ef1d9a8a1b2b02f5df109dfcf82 Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Tue, 3 Jul 2018 22:53:22 +0200
Subject: [PATCH] Try to fix a crash

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 .../com/nextcloud/talk/controllers/CallController.java   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
index 0234aa798..ee102b220 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
@@ -1016,8 +1016,13 @@ public class CallController extends BaseController {
                     public void onNext(GenericOverall genericOverall) {
                         inCall = true;
 
-                        connectingView.setVisibility(View.GONE);
-                        conversationView.setVisibility(View.VISIBLE);
+                        if (connectingView != null) {
+                            connectingView.setVisibility(View.GONE);
+                        }
+
+                        if (conversationView != null) {
+                            conversationView.setVisibility(View.VISIBLE);
+                        }
 
                         if (!isPTTActive) {
                             animateCallControls(false, 5000);