Merge branch 'master' into develop

1 files changed, 4 insertions, 0 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
index 6a8bc2585..974cbb370 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
@@ -173,6 +173,8 @@ public class ItemFragment extends Fragment {
                     && UsageStatistics.hasSignificantBiasTo(UsageStatistics.ACTION_STREAM)) {
                 showOnDemandConfigBalloon(true);
                 return;
+            } else if (actionButton1 == null) {
+                return; // Not loaded yet
             }
             actionButton1.onClick(getContext());
         });
@@ -181,6 +183,8 @@ public class ItemFragment extends Fragment {
                     && UsageStatistics.hasSignificantBiasTo(UsageStatistics.ACTION_DOWNLOAD)) {
                 showOnDemandConfigBalloon(false);
                 return;
+            } else if (actionButton2 == null) {
+                return; // Not loaded yet
             }
             actionButton2.onClick(getContext());
         });