diff options
author | Christian Schneppe <christian@pix-art.de> | 2016-05-15 23:24:15 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2016-05-15 23:24:15 +0200 |
commit | c73425e79a98f99e031d1bfd5f2f79bbd052f74f (patch) | |
tree | fee52111dbfb8f4b574810acafc6c46f0dbf9e4a | |
parent | 6376e5fd74dd199b5ab0f71686adff65c05798a6 (diff) |
fixed crash on startup
-rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java index 335c5a813..e657441fa 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java @@ -564,13 +564,12 @@ public class ConversationActivity extends XmppActivity //hide settings, accounts and updater in all menus except in main window menuUpdater.setVisible(false); - if (this.getSelectedConversation().getMode() == Conversation.MODE_SINGLE) { - menuArchiveMuc.setVisible(false); - } else { - menuArchiveChat.setVisible(false); - } - if (this.getSelectedConversation() != null) { + if (this.getSelectedConversation().getMode() == Conversation.MODE_SINGLE) { + menuArchiveMuc.setVisible(false); + } else { + menuArchiveChat.setVisible(false); + } if (this.getSelectedConversation().getNextEncryption() != Message.ENCRYPTION_NONE) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { menuSecure.setIcon(R.drawable.ic_lock_white_24dp); |