aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-03-28 12:58:40 +0100
committerDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-03-28 12:58:40 +0100
commitb9664643243118550eef7c23026660a1cf3113e1 (patch)
tree0eee1ac0b1528e665f3519d109c9a46865ac2102
parent0b235171a82d41a00dda5e5f64ff73ffb24f4d10 (diff)
fixed null pointer issue
-rw-r--r--src/eu/siacs/conversations/ui/ConversationActivity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/eu/siacs/conversations/ui/ConversationActivity.java b/src/eu/siacs/conversations/ui/ConversationActivity.java
index 5bb8113a..61a23e77 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();