From f41c3eee04a647fa3f44da20ca77928731ce8946 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Mon, 17 Nov 2014 20:02:46 +0100
Subject: context menu for muc participants + refactor trueCounterpart to use
 Jid class

---
 src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/main/java/eu/siacs/conversations/ui/ConversationFragment.java')

diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 0742e17e..cf02c970 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -494,6 +494,9 @@ public class ConversationFragment extends Fragment {
 	}
 
 	public void reInit(Conversation conversation) {
+		if (conversation == null) {
+			return;
+		}
 		if (this.conversation != null) {
 			this.conversation.setNextMessage(mEditMessage.getText().toString());
 		}
-- 
cgit v1.2.3