diff options
author | Christian Schneppe <christian@pix-art.de> | 2018-05-17 21:29:35 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2018-05-17 21:29:35 +0200 |
commit | ea913ce9cd9b7f020425b62e19f4822f8e1dd1e4 (patch) | |
tree | 05b5c6379924a4bab717cef2e9fc18a3cc910189 /src/main/java/de/pixart/messenger | |
parent | d6f38f3ae1c20e3963a4c0fc5ab02bb2b9fcf1de (diff) |
fix crash on destroying muc
Diffstat (limited to 'src/main/java/de/pixart/messenger')
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java | 6 |
1 files changed, 4 insertions, 2 deletions
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(); } |