aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-04-28 13:56:08 +0200
committerDaniel Gultsch <daniel@gultsch.de>2015-04-28 13:56:08 +0200
commitf3805b8bab6cc8aead9ea19e98161eb872d05996 (patch)
tree93327b089ad5ad513dcc8b288165f5b44c2860bf /src
parent51bf8ec98ea6b628ed38d03969492ef0fddd6c77 (diff)
stop conference details from crashing when rotating the screen
Diffstat (limited to '')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
index e4bfd6ff..8c4f6eaf 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
@@ -237,6 +237,9 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
MenuItem menuItemDeleteBookmark = menu.findItem(R.id.action_delete_bookmark);
MenuItem menuItemAdvancedMode = menu.findItem(R.id.action_advanced_mode);
menuItemAdvancedMode.setChecked(mAdvancedMode);
+ if (mConversation == null) {
+ return true;
+ }
Account account = mConversation.getAccount();
if (account.hasBookmarkFor(mConversation.getJid().toBareJid())) {
menuItemSaveBookmark.setVisible(false);