From 5cf82e9c8a0c225dbbc30ffe854c65d6e6871d08 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sat, 26 Jan 2019 23:12:09 +0100
Subject: fix crash on getting bookmarks

---
 .../de/pixart/messenger/ui/ConferenceDetailsActivity.java    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

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

diff --git a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
index ec9957b7c..8b88d849e 100644
--- a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
@@ -332,11 +332,13 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
         this.binding.mucEditSubject.addTextChangedListener(this);
         this.binding.mucEditSubject.addTextChangedListener(new StylingHelper.MessageEditorStyler(this.binding.mucEditSubject));
         this.binding.autojoinCheckbox.setOnCheckedChangeListener((buttonView, isChecked) -> {
-            final Bookmark bookmark = mConversation.getBookmark();
-            if (bookmark != null) {
-                bookmark.setAutojoin(this.binding.autojoinCheckbox.isChecked());
-                xmppConnectionService.pushBookmarks(bookmark.getAccount());
-                updateView();
+            if (mConversation != null) {
+                final Bookmark bookmark = mConversation.getBookmark();
+                if (bookmark != null) {
+                    bookmark.setAutojoin(this.binding.autojoinCheckbox.isChecked());
+                    xmppConnectionService.pushBookmarks(bookmark.getAccount());
+                    updateView();
+                }
             }
         });
         mMediaAdapter = new MediaAdapter(this, R.dimen.media_size);
-- 
cgit v1.2.3