From a316739c9e14a44953678a27750afb73fb07b01b Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Fri, 27 Sep 2019 11:55:43 +0200
Subject: [PATCH] Few more fixes

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

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 ec5f2da3c..1b5f79564 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
@@ -673,9 +673,14 @@ public class ChatController extends BaseController implements MessagesListAdapte
 
         if (inConversation) {
             if (wasDetached && conversationUser.hasSpreedFeatureCapability("no-ping")) {
-                currentConversation.setSessionId("0");
-                wasDetached = false;
-                joinRoomWithPassword();
+                if (currentConversation != null) {
+                    currentConversation.setSessionId("0");
+                    wasDetached = false;
+                    joinRoomWithPassword();
+                } else {
+                    wasDetached = false;
+                    getRoomInfo();
+                }
             }
         }
     }