From 1fbb92fb4f69fb8ee3eb2759d96c1a9899b32a99 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sat, 8 Jun 2019 14:11:09 +0200
Subject: fixed NPE in channel discovery after race to create menu

---
 src/main/java/de/pixart/messenger/ui/ChannelDiscoveryActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java/de/pixart/messenger/ui/ChannelDiscoveryActivity.java')

diff --git a/src/main/java/de/pixart/messenger/ui/ChannelDiscoveryActivity.java b/src/main/java/de/pixart/messenger/ui/ChannelDiscoveryActivity.java
index 3233aa35c..79d88ca6f 100644
--- a/src/main/java/de/pixart/messenger/ui/ChannelDiscoveryActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ChannelDiscoveryActivity.java
@@ -87,7 +87,7 @@ public class ChannelDiscoveryActivity extends XmppActivity implements MenuItem.O
             mMenuSearchView.expandActionView();
             mSearchEditText.append(initialSearchValue);
             mSearchEditText.requestFocus();
-            if (optedIn) {
+            if (optedIn && xmppConnectionService != null) {
                 xmppConnectionService.discoverChannels(initialSearchValue, this);
             }
         }
-- 
cgit v1.2.3