From 617c2cc18e081d60712e229f06eaea1f253cf30e Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 29 Dec 2018 07:24:43 +0000
Subject: [PATCH] Fixed multi pane menu

---
 app/src/main/java/eu/faircode/email/FragmentEx.java | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentEx.java b/app/src/main/java/eu/faircode/email/FragmentEx.java
index c495d9e430..15ae05a02b 100644
--- a/app/src/main/java/eu/faircode/email/FragmentEx.java
+++ b/app/src/main/java/eu/faircode/email/FragmentEx.java
@@ -118,13 +118,22 @@ public class FragmentEx extends Fragment {
         super.onDestroy();
     }
 
+    @Override
+    public void setHasOptionsMenu(boolean hasMenu) {
+        super.setHasOptionsMenu(!isPane() && hasMenu);
+    }
+
     private void updateSubtitle() {
         AppCompatActivity activity = (AppCompatActivity) getActivity();
-        Bundle args = getArguments();
-        if (activity != null && (args == null || !args.getBoolean("pane"))) {
+        if (activity != null && !isPane()) {
             ActionBar actionbar = activity.getSupportActionBar();
             if (actionbar != null)
                 actionbar.setSubtitle(subtitle);
         }
     }
+
+    private boolean isPane() {
+        Bundle args = getArguments();
+        return (args != null && args.getBoolean("pane"));
+    }
 }