From 7c275ccfbf78262cd9d05d5dd7c83cc7cc416290 Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Thu, 24 Jan 2019 12:07:11 +0100
Subject: [PATCH] Fix a bug in chat that caused crash when leaving sometimes

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 .../java/com/nextcloud/talk/controllers/ChatController.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
index 042e3859f..c41761014 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
@@ -909,7 +909,9 @@ public class ChatController extends BaseController implements MessagesListAdapte
                     }
                 }
 
-                adapter.addToEnd(chatMessageList, false);
+                if (adapter != null) {
+                    adapter.addToEnd(chatMessageList, false);
+                }
 
             } else {