From 45c760a507cb5d67ebd325e850bcadcd0889199f Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Fri, 21 Dec 2018 19:51:44 +0800
Subject: [PATCH] Check mGalleryView null in GalleryMenuHelper

---
 .../java/com/hippo/ehviewer/ui/GalleryActivity.java  | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java
index 417e71de1..4715899e2 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java
@@ -781,6 +781,10 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
 
         @Override
         public void onClick(DialogInterface dialog, int which) {
+            if (mGalleryView == null) {
+                return;
+            }
+
             int screenRotation = mScreenRotation.getSelectedItemPosition();
             int layoutMode = GalleryView.sanitizeLayoutMode(mReadingDirection.getSelectedItemPosition());
             int scaleMode = GalleryView.sanitizeScaleMode(mScaleMode.getSelectedItemPosition());
@@ -825,11 +829,9 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
                     break;
             }
             setRequestedOrientation(orientation);
-            if (mGalleryView != null) {
-                mGalleryView.setLayoutMode(layoutMode);
-                mGalleryView.setScaleMode(scaleMode);
-                mGalleryView.setStartPosition(startPosition);
-            }
+            mGalleryView.setLayoutMode(layoutMode);
+            mGalleryView.setScaleMode(scaleMode);
+            mGalleryView.setStartPosition(startPosition);
             if (keepScreenOn) {
                 getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
             } else {