[Android] Video player: Fix nullity check

Geoffrey Métais git at videolan.org
Tue Jan 29 09:43:57 CET 2019


vlc-android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Tue Jan 29 09:35:17 2019 +0100| [3f2f58e0548a6bcbeb696306d9911bfd23af607f] | committer: Geoffrey Métais

Video player: Fix nullity check

> https://code.videolan.org/videolan/vlc-android/commit/3f2f58e0548a6bcbeb696306d9911bfd23af607f
---

 vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java | 2 +-
 1 file changed, 1 insertion(+), 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 0a2c3fca9..161dd63c0 100644
--- a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
@@ -470,7 +470,7 @@ public class VideoPlayerActivity extends AppCompatActivity implements IPlaybackS
                             && AndroidDevices.isAndroidTv && !requestVisibleBehind(true)))
                 stopPlayback();
             else if (!mShowingDialog && "2".equals(mSettings.getString(PreferencesActivity.KEY_VIDEO_APP_SWITCH, "0"))
-                    && isInteractive() && (mService == null || !mService.hasRenderer())) {
+                    && isInteractive() && (mService != null && !mService.hasRenderer())) {
                 switchToPopup();
             }
         }



More information about the Android mailing list