aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/eu/siacs/conversations/ui/ConversationActivity.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/eu/siacs/conversations/ui/ConversationActivity.java b/src/eu/siacs/conversations/ui/ConversationActivity.java
index 1f2747f7..f94d6b73 100644
--- a/src/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/eu/siacs/conversations/ui/ConversationActivity.java
@@ -669,8 +669,11 @@ public class ConversationActivity extends XmppActivity implements
@Override
public void onSaveInstanceState(Bundle savedInstanceState) {
- savedInstanceState.putString(STATE_OPEN_CONVERSATION,
- getSelectedConversation().getUuid());
+ Conversation conversation = getSelectedConversation();
+ if (conversation!=null) {
+ savedInstanceState.putString(STATE_OPEN_CONVERSATION,
+ conversation.getUuid());
+ }
savedInstanceState.putBoolean(STATE_PANEL_OPEN,
isConversationsOverviewVisable());
super.onSaveInstanceState(savedInstanceState);