commit 5bf4c4b71ea075745b4e9ca1c4536bb1dd576588
author The Android Automerger <android-build@android.com> Tue Oct 18 06:28:26 2011 -0700
committer The Android Automerger <android-build@android.com> Tue Oct 18 06:28:26 2011 -0700
tree 28b24c500f5f95413542297f0cac214352253ff2
parent 136c335a69069bbb07af1a842acc4629c3131139
parent cc4c122ad11651b7c9481144cb9d7f78f2b2ada4

merge in ics-mr0-release history after reset to ics-mr0

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();