From ea913ce9cd9b7f020425b62e19f4822f8e1dd1e4 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Thu, 17 May 2018 21:29:35 +0200
Subject: fix crash on destroying muc

---
 src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/main/java/de')

diff --git a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
index 995fdc0aa..fab8c5ea7 100644
--- a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
@@ -529,8 +529,10 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
     protected void deleteBookmark() {
         Account account = mConversation.getAccount();
         Bookmark bookmark = mConversation.getBookmark();
-        bookmark.setConversation(null);
-        account.getBookmarks().remove(bookmark);
+        if (bookmark != null) {
+            account.getBookmarks().remove(bookmark);
+            bookmark.setConversation(null);
+        }
         xmppConnectionService.pushBookmarks(account);
         updateView();
     }
-- 
cgit v1.2.3