Do not switch screens when clicking "Remove podcast" (#6259)

1 files changed, 7 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 e155e467d..ecb24a1e1 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/NavDrawerFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/NavDrawerFragment.java
@@ -175,8 +175,13 @@ public class NavDrawerFragment extends Fragment implements SharedPreferences.OnS
             new RenameItemDialog(getActivity(), feed).show();
             return true;
         } else if (itemId == R.id.remove_feed) {
-            ((MainActivity) getActivity()).loadFragment(AllEpisodesFragment.TAG, null);
-            RemoveFeedDialog.show(getContext(), feed);
+            RemoveFeedDialog.show(getContext(), feed, () -> {
+                if (String.valueOf(feed.getId()).equals(getLastNavFragment(getContext()))) {
+                    ((MainActivity) getActivity()).loadFragment(UserPreferences.getDefaultPage(), null);
+                    // Make sure fragment is hidden before actually starting to delete
+                    getActivity().getSupportFragmentManager().executePendingTransactions();
+                }
+            });
             return true;
         }
         return super.onContextItemSelected(item);