diff options
Diffstat (limited to 'src/eu/siacs/conversations/ui/ConversationFragment.java')
| -rw-r--r-- | src/eu/siacs/conversations/ui/ConversationFragment.java | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/eu/siacs/conversations/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java index 6c88fcb3..3b8b6888 100644 --- a/src/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/eu/siacs/conversations/ui/ConversationFragment.java @@ -337,16 +337,19 @@ public class ConversationFragment extends Fragment { this.selfBitmap = findSelfPicture(); updateMessages(); // rendering complete. now go tell activity to close pane - if (!activity.shouldPaneBeOpen()) { - activity.getSlidingPaneLayout().closePane(); - activity.getActionBar().setDisplayHomeAsUpEnabled(true); - activity.getActionBar().setTitle(conversation.getName()); - activity.invalidateOptionsMenu(); - if (!conversation.isRead()) { - conversation.markRead(); - activity.updateConversationList(); + if (activity.getSlidingPaneLayout().isSlideable()) { + if (!activity.shouldPaneBeOpen()) { + activity.getSlidingPaneLayout().closePane(); + activity.getActionBar().setDisplayHomeAsUpEnabled(true); + activity.getActionBar().setTitle(conversation.getName()); + activity.invalidateOptionsMenu(); + } } + if (!conversation.isRead()) { + conversation.markRead(); + activity.updateConversationList(); + } if (queuedPqpMessage != null) { this.conversation.nextMessageEncryption = Message.ENCRYPTION_PGP; Message message = new Message(conversation, queuedPqpMessage, |