Merge pull request #4998 from ByteHamster/fix-navdrawer-pressed

Only react to onContextItemSelected if something was actually selected

1 files changed, 4 insertions, 2 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/NavDrawerFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/NavDrawerFragment.java
index ee11f6bfe..6c4abadc1 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/NavDrawerFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/NavDrawerFragment.java
@@ -134,8 +134,10 @@ public class NavDrawerFragment extends Fragment implements SharedPreferences.OnS
 
     @Override
     public boolean onContextItemSelected(@NonNull MenuItem item) {
-        if (contextPressedItem.type == NavDrawerData.DrawerItem.Type.FEED) {
-            return onFeedContextMenuClicked(((NavDrawerData.FeedDrawerItem) contextPressedItem).feed, item);
+        NavDrawerData.DrawerItem pressedItem = contextPressedItem;
+        contextPressedItem = null;
+        if (pressedItem != null && pressedItem.type == NavDrawerData.DrawerItem.Type.FEED) {
+            return onFeedContextMenuClicked(((NavDrawerData.FeedDrawerItem) pressedItem).feed, item);
         }
         return false;
     }