aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/entities
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/de/pixart/messenger/entities')
-rw-r--r--src/main/java/de/pixart/messenger/entities/Bookmark.java1
-rw-r--r--src/main/java/de/pixart/messenger/entities/Conversation.java1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/main/java/de/pixart/messenger/entities/Bookmark.java b/src/main/java/de/pixart/messenger/entities/Bookmark.java
index 29f7a3c26..6b4bea4e9 100644
--- a/src/main/java/de/pixart/messenger/entities/Bookmark.java
+++ b/src/main/java/de/pixart/messenger/entities/Bookmark.java
@@ -172,5 +172,6 @@ public class Bookmark extends Element implements ListItem {
if (this.mJoinedConversation != null) {
this.mJoinedConversation.deregisterWithBookmark();
}
+ this.mJoinedConversation = null;
}
}
diff --git a/src/main/java/de/pixart/messenger/entities/Conversation.java b/src/main/java/de/pixart/messenger/entities/Conversation.java
index f654902b4..52525e481 100644
--- a/src/main/java/de/pixart/messenger/entities/Conversation.java
+++ b/src/main/java/de/pixart/messenger/entities/Conversation.java
@@ -817,6 +817,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
if (this.bookmark != null) {
this.bookmark.setConversation(null);
}
+ this.bookmark = null;
}
public Bookmark getBookmark() {