Merge pull request nickbutcher#83 from amilcar-andrade/prevent-npe-pl…

…ayer-act Prevent PlayerActivity from crashing
xsobolx · May 9, 2016 · 8e21f01 · 8e21f01
2 parents 6eb2a65 + 4ea998c
commit 8e21f01
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/app/src/main/java/io/plaidapp/ui/PlayerActivity.java b/app/src/main/java/io/plaidapp/ui/PlayerActivity.java
@@ -154,11 +154,17 @@ protected void onPause() {
 
     @Override
     protected void onDestroy() {
-        dataManager.cancelLoading();
+        if (dataManager != null) {
+            dataManager.cancelLoading();
+        }
         super.onDestroy();
     }
 
     private void bindPlayer() {
+        if (player == null) {
+            return;
+        }
+
         final Resources res = getResources();
         final NumberFormat nf = NumberFormat.getInstance();