Browse Source

Merge pull request #295 from florian-f/master

Fix NullPointerException in PreviewMediaFragment.
Tobias Kaminsky 8 years ago
parent
commit
85bb93871b
1 changed files with 13 additions and 9 deletions
  1. 13 9
      src/com/owncloud/android/ui/preview/PreviewMediaFragment.java

+ 13 - 9
src/com/owncloud/android/ui/preview/PreviewMediaFragment.java

@@ -248,17 +248,21 @@ public class PreviewMediaFragment extends FileFragment implements
         outState.putParcelable(PreviewMediaFragment.EXTRA_ACCOUNT, mAccount);
 
         if (getFile().isVideo()) {
-            mSavedPlaybackPosition = mVideoPreview.getCurrentPosition();
-            mAutoplay = mVideoPreview.isPlaying();
-            outState.putInt(PreviewMediaFragment.EXTRA_PLAY_POSITION, mSavedPlaybackPosition);
-            outState.putBoolean(PreviewMediaFragment.EXTRA_PLAYING, mAutoplay);
+            if (mVideoPreview != null) {
+                mSavedPlaybackPosition = mVideoPreview.getCurrentPosition();
+                mAutoplay = mVideoPreview.isPlaying();
+                outState.putInt(PreviewMediaFragment.EXTRA_PLAY_POSITION, mSavedPlaybackPosition);
+                outState.putBoolean(PreviewMediaFragment.EXTRA_PLAYING, mAutoplay);
+            }
         }
         else {
-            outState.putInt(
-                    PreviewMediaFragment.EXTRA_PLAY_POSITION,
-                    mMediaServiceBinder.getCurrentPosition());
-            outState.putBoolean(
-                    PreviewMediaFragment.EXTRA_PLAYING, mMediaServiceBinder.isPlaying());
+            if (mMediaServiceBinder != null) {
+                outState.putInt(
+                        PreviewMediaFragment.EXTRA_PLAY_POSITION,
+                        mMediaServiceBinder.getCurrentPosition());
+                outState.putBoolean(
+                        PreviewMediaFragment.EXTRA_PLAYING, mMediaServiceBinder.isPlaying());
+            }
         }
     }