From 60ab03afb119a61503f101da91f54f15124f9373 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 27 Feb 2016 10:25:31 +0100
Subject: changed single_account config into more simple lock_settings

---
 src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index 7b2565c3..55a12710 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -420,7 +420,7 @@ public class ConversationActivity extends XmppActivity
 				}
 			}
 		}
-		return true;
+		return super.onCreateOptionsMenu(menu);
 	}
 
 	protected void selectPresenceToAttachFile(final int attachmentChoice, final int encryption) {
-- 
cgit v1.2.3