[Android] Add nullity check
Geoffrey Métais
git at videolan.org
Tue Dec 20 17:54:34 CET 2016
vlc-android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Tue Dec 20 17:46:37 2016 +0100| [9fae2ccc93aa13569187c08b5e09653535cd82cc] | committer: Geoffrey Métais
Add nullity check
> https://code.videolan.org/videolan/vlc-android/commit/9fae2ccc93aa13569187c08b5e09653535cd82cc
---
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 1002556..571be63 100644
--- a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
@@ -2027,7 +2027,8 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C
}
if (mFov != 0f && mScaleGestureDetector != null)
mScaleGestureDetector.onTouchEvent(event);
- if (mScaleGestureDetector.isInProgress() || (mDetector != null && mDetector.onTouchEvent(event)))
+ if ((mScaleGestureDetector != null && mScaleGestureDetector.isInProgress()) ||
+ (mDetector != null && mDetector.onTouchEvent(event)))
return true;
float x_changed, y_changed;
More information about the Android
mailing list