Do not prepare if release has already been called

protyposis · Oct 3, 2016 · 8c511fe · 8c511fe
1 parent a6a1d36
commit 8c511fe
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/MediaPlayer/src/main/java/net/protyposis/android/mediaplayer/VideoView.java b/MediaPlayer/src/main/java/net/protyposis/android/mediaplayer/VideoView.java
@@ -174,14 +174,20 @@ public boolean handleMessage(Message msg) {
             @Override
             public void run() {
                 try {
+                    mCurrentState = STATE_PREPARING;
+
                     mPlayer.setDataSource(mSource);
 
+                    if(mPlayer == null) {
+                        // player has been release while the data source was set
+                        return;
+                    }
+
                     // Async prepare spawns another thread inside this thread which really isn't
                     // necessary; we call this method anyway because of the events it triggers
                     // when it fails, and to stay in sync which the Android VideoView that does
                     // the same.
                     mPlayer.prepareAsync();
-                    mCurrentState = STATE_PREPARING;
 
                     Log.d(TAG, "video opened");
                 } catch (IOException e) {
@@ -270,6 +276,8 @@ private void release() {
             mPlayer.release();
             mPlayer = null;
         }
+        mCurrentState = STATE_IDLE;
+        mTargetState = STATE_IDLE;
     }
 
     public void setOnPreparedListener(MediaPlayer.OnPreparedListener l) {