commit 10a42f4b16bf43c686f10bfac5d879b46421fbb0
author Eino-Ville Talvala <etalvala@google.com> Wed Nov 16 12:50:27 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 16 12:50:27 2011 -0800
tree 4d9a0f5fee44eb59bc16d5a0f1001a53120648db
parent 8ac93cfe05ce7fce703d7316ffb3edf19266548a
parent 0e3f8387302b4aa882c20891f1faba74030f1a4f

Merge "Fix EffectsRecorder error path handling when ending recording." into ics-mr1

src/com/android/camera/EffectsRecorder.java

diff --git a/src/com/android/camera/EffectsRecorder.java b/src/com/android/camera/EffectsRecorder.java
index 390efa6..3d2aebf 100644
--- a/src/com/android/camera/EffectsRecorder.java
+++ b/src/com/android/camera/EffectsRecorder.java
@@ -798,7 +798,13 @@
                 if (result == GraphRunner.RESULT_ERROR) {
                     // Handle error case
                     Log.e(TAG, "Error running filter graph!");
-                    raiseError(mRunner == null ? null : mRunner.getError());
+                    Exception e = null;
+                    if (mRunner != null) {
+                        e = mRunner.getError();
+                    } else if (mOldRunner != null) {
+                        e = mOldRunner.getError();
+                    }
+                    raiseError(e);
                 }
                 if (mOldRunner != null) {
                     // Tear down old graph if available