From 6de53791b5db4513f662dabbdfe83db29eb4d666 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Sun, 10 Aug 2014 14:04:59 +0200
Subject: [PATCH] fixed rare npe after race condition

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

diff --git a/src/eu/siacs/conversations/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java
index 925949cd4..e0733291c 100644
--- a/src/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/eu/siacs/conversations/ui/ConversationFragment.java
@@ -272,6 +272,7 @@ public class ConversationFragment extends Fragment {
 	}
 
 	public void onBackendConnected() {
+		this.activity = (ConversationActivity) getActivity();
 		this.conversation = activity.getSelectedConversation();
 		if (this.conversation == null) {
 			return;