From 2bc3afe152176237f8fad429d735212f145cb233 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Geoffrey=20M=C3=A9tais?= Date: Fri, 27 May 2016 17:52:57 +0200 Subject: [PATCH] Keep same mediawrapper loaded Fixes subtitles tracks lost on apps switch --- .../videolan/vlc/gui/video/VideoPlayerActivity.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) 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 55374e86b..a782a68bf 100644 --- a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java +++ b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java @@ -869,7 +869,10 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C time = 0; else time -= 2000; // go back 2 seconds, to compensate loading time - mService.stop(); + if (isFinishing()) + mService.stop(); + else + mService.pause(); SharedPreferences.Editor editor = mSettings.edit(); // Save position @@ -2935,8 +2938,10 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C mService.addCallback(this); /* prepare playback */ boolean hasMedia = mService.hasMedia(); - if (media == null) - media = hasMedia ? mService.getCurrentMediaWrapper() : new MediaWrapper(mUri); + if (hasMedia) + media = mService.getCurrentMediaWrapper(); + else if (media == null) + media = new MediaWrapper(mUri); if (mWasPaused) media.addFlags(MediaWrapper.MEDIA_PAUSED); if (mHardwareAccelerationError || intent.hasExtra(PLAY_DISABLE_HARDWARE)) -- GitLab