From 3bb585c020f6b21e41de7ce6d8ee9cb0675a9b54 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Thu, 26 Jun 2014 12:09:12 +0200
Subject: [PATCH] fixed rare bug with attach image menu

---
 src/eu/siacs/conversations/ui/ConversationActivity.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/eu/siacs/conversations/ui/ConversationActivity.java b/src/eu/siacs/conversations/ui/ConversationActivity.java
index 1e806d31d..d48367194 100644
--- a/src/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/eu/siacs/conversations/ui/ConversationActivity.java
@@ -461,6 +461,9 @@ public class ConversationActivity extends XmppActivity {
 			break;
 		case R.id.action_attach_file:
 			View menuAttachFile = findViewById(R.id.action_attach_file);
+			if (menuAttachFile==null) {
+				break;
+			}
 			PopupMenu attachFilePopup = new PopupMenu(this, menuAttachFile);
 			attachFilePopup.inflate(R.menu.attachment_choices);
 			attachFilePopup
@@ -519,6 +522,9 @@ public class ConversationActivity extends XmppActivity {
 		case R.id.action_security:
 			final Conversation conversation = getSelectedConversation();
 			View menuItemView = findViewById(R.id.action_security);
+			if (menuItemView==null) {
+				break;
+			}
 			PopupMenu popup = new PopupMenu(this, menuItemView);
 			final ConversationFragment fragment = (ConversationFragment) getFragmentManager()
 					.findFragmentByTag("conversation");