[Android] VideoPlayer: fix crash if mUri is null when stopping

Thomas Guillem git at videolan.org
Mon Jun 29 17:22:27 CEST 2015


vlc-ports/android | branch: master | Thomas Guillem <thomas at gllm.fr> | Mon Jun 29 17:03:52 2015 +0200| [da8238c95a4fd953e3ef763797bac2d05cc60506] | committer: Thomas Guillem

VideoPlayer: fix crash if mUri is null when stopping

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=da8238c95a4fd953e3ef763797bac2d05cc60506
---

 vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
index 2ba0752..0a4df44 100644
--- a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
@@ -790,7 +790,8 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C
         }
         editor.putString(PreferencesActivity.VIDEO_SUBTITLE_FILES, subtitleList_serialized);
 
-        editor.putString(PreferencesActivity.VIDEO_LAST, mUri.toString());
+        if (mUri != null)
+            editor.putString(PreferencesActivity.VIDEO_LAST, mUri.toString());
 
         // Save user playback speed and restore normal speed
         editor.putFloat(PreferencesActivity.VIDEO_SPEED, MediaPlayer().getRate());



More information about the Android mailing list