commit 136c335a69069bbb07af1a842acc4629c3131139
author Wu-cheng Li <wuchengli@google.com> Tue Oct 18 18:51:38 2011 +0800
committer Wu-cheng Li <wuchengli@google.com> Tue Oct 18 18:51:38 2011 +0800
tree 28b24c500f5f95413542297f0cac214352253ff2
parent 52c5c76bddbf3994867a00d0e266b390592486aa

Fix 5472996: NPE in switchToOtherMode.

Change-Id: Ied128d3cf5e8ee632c46f371aeaa0a42bb2f1cb5

src/com/android/camera/Camera.java

diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index 8cc5816..a66a764 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -2078,7 +2078,7 @@
 
     private boolean switchToOtherMode(int mode) {
         if (isFinishing()) return false;
-        mImageSaver.waitDone();
+        if (mImageSaver != null) mImageSaver.waitDone();
         MenuHelper.gotoMode(mode, Camera.this);
         mHandler.removeMessages(FIRST_TIME_INIT);
         finish();