diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-10-06 19:27:58 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-10-06 19:27:58 +0200 |
| commit | 0a93093bc7c0bbd2bf98da799a3d6724dae2bf02 (patch) | |
| tree | 6150f4488fe4f529e1ab648ce6080796fdd0a366 /src/eu | |
| parent | 16d5429f803dfa6e76110dd83e8f04377358f839 (diff) | |
fixed npe
Diffstat (limited to 'src/eu')
| -rw-r--r-- | src/eu/siacs/conversations/ui/ConversationActivity.java | 7 |
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 1f2747f78..f94d6b733 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); |