Fixed crashes in FeedItemlist

1 files changed, 6 insertions, 3 deletions

diff --git a/src/de/danoeh/antennapod/fragment/ItemlistFragment.java b/src/de/danoeh/antennapod/fragment/ItemlistFragment.java
index 282bb4d5c..436210a70 100644
--- a/src/de/danoeh/antennapod/fragment/ItemlistFragment.java
+++ b/src/de/danoeh/antennapod/fragment/ItemlistFragment.java
@@ -125,21 +125,24 @@ public class ItemlistFragment extends ListFragment {
     }
 
     @Override
-    public void onDestroyView() {
-        super.onDestroyView();
+    public void onStop() {
+        super.onStop();
         EventDistributor.getInstance().unregister(contentUpdate);
         if (currentLoadTask != null) {
             currentLoadTask.cancel(true);
         }
     }
 
-    protected void loadData() {
+    protected synchronized void loadData() {
         final long feedId;
         if (feed == null) {
             feedId = getArguments().getLong(ARGUMENT_FEED_ID);
         } else {
             feedId = feed.getId();
         }
+        if (currentLoadTask != null) {
+            currentLoadTask.cancel(true);
+        }
         AsyncTask<Long, Void, Feed> loadTask = new AsyncTask<Long, Void, Feed>(){
             private volatile List<Long> queueRef;