1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/camera/CaptureUI.java b/src/com/android/camera/CaptureUI.java
index 8bbbf1753..e8c3c6b07 100755
--- a/src/com/android/camera/CaptureUI.java
+++ b/src/com/android/camera/CaptureUI.java
@@ -624,7 +624,7 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
     }
 
     public void openSettingsMenu() {
-        if (mPreviewLayout.getVisibility() == View.VISIBLE) {
+        if (mPreviewLayout != null && mPreviewLayout.getVisibility() == View.VISIBLE) {
             return;
         }
         clearFocus();
@@ -1665,6 +1665,9 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
         boolean changed = (width != mPreviewWidth) || (height != mPreviewHeight);
         mPreviewWidth = width;
         mPreviewHeight = height;
+        if (changed) {
+            showSurfaceView();
+        }
         return changed;
     }