aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2019-06-08 14:11:09 +0200
committerChristian Schneppe <christian@pix-art.de>2019-06-08 14:11:09 +0200
commit1fbb92fb4f69fb8ee3eb2759d96c1a9899b32a99 (patch)
tree1182b2f9fb5e113162325219df9415de864ba8aa /src/main
parent2ff5449dcdb9c8cd45775d7582f2faa90458cb57 (diff)
fixed NPE in channel discovery after race to create menu
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/de/pixart/messenger/ui/ChannelDiscoveryActivity.java2
1 files changed, 1 insertions, 1 deletions
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);
}
}