aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-04-22 10:35:19 +0200
committerChristian Schneppe <christian@pix-art.de>2018-04-22 10:35:19 +0200
commit4195b87110e39e0a74e9e78a546a4adf32156337 (patch)
tree805ac21be5d4f0fae0e960687f2883569d23ff2d /src/main
parent93cf923348a2d5992a201b51b292bfe8280e9d1d (diff)
catch NPE
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/de/pixart/messenger/ui/StartConversationActivity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
index 78395cead..c04db44aa 100644
--- a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
@@ -548,7 +548,7 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
getMenuInflater().inflate(R.menu.start_conversation, menu);
MenuItem menuHideOffline = menu.findItem(R.id.action_hide_offline);
MenuItem menuActionAccounts = menu.findItem(R.id.action_accounts);
- if (xmppConnectionService.getAccounts().size() == 1 && !xmppConnectionService.multipleAccounts()) {
+ if (xmppConnectionService != null && xmppConnectionService.getAccounts().size() == 1 && !xmppConnectionService.multipleAccounts()) {
menuActionAccounts.setTitle(R.string.mgmt_account_edit);
} else {
menuActionAccounts.setTitle(R.string.action_accounts);