From b9664643243118550eef7c23026660a1cf3113e1 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Fri, 28 Mar 2014 12:58:40 +0100 Subject: [PATCH] fixed null pointer issue --- src/eu/siacs/conversations/ui/ConversationActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/eu/siacs/conversations/ui/ConversationActivity.java b/src/eu/siacs/conversations/ui/ConversationActivity.java index 5bb8113a1..61a23e770 100644 --- a/src/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/eu/siacs/conversations/ui/ConversationActivity.java @@ -206,7 +206,7 @@ public class ConversationActivity extends XmppActivity { @Override public void onPanelClosed(View arg0) { paneShouldBeOpen = false; - if (conversationList.size() > 0) { + if ((conversationList.size() > 0)&&(getSelectedConversation()!=null)) { getActionBar().setDisplayHomeAsUpEnabled(true); getActionBar().setTitle(getSelectedConversation().getName(useSubject)); invalidateOptionsMenu();