From: nicolasroard <nicolasroard@google.com>
Date: Sat, 9 Feb 2013 01:48:54 +0000 (-0800)
Subject: Fix crash when reset
X-Git-Tag: android-x86-6.0-r3~68^2~28^2~213^2~19^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2~428^2~2^2~201^2~376
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=50ffa17594ab620b62db0cbb98d0b3a0fb4ac4fc;p=android-x86%2Fpackages-apps-Camera2.git

Fix crash when reset

Change-Id: Ibab01c4e218e30f3f4a67665d99dbc14bdc7d8ea
---

diff --git a/src/com/android/gallery3d/filtershow/PanelController.java b/src/com/android/gallery3d/filtershow/PanelController.java
index 6694e37f6..2a97e7e53 100644
--- a/src/com/android/gallery3d/filtershow/PanelController.java
+++ b/src/com/android/gallery3d/filtershow/PanelController.java
@@ -479,7 +479,7 @@ public class PanelController implements OnClickListener {
             mCurrentEditor = null;
             FilterIconButton component = (FilterIconButton) view;
             ImageFilter filter = component.getImageFilter();
-            if (filter.getEditingViewId() != 0) {
+            if (filter != null && filter.getEditingViewId() != 0) {
                 if (mEditorPlaceHolder.contains(filter.getEditingViewId())) {
                     mCurrentEditor = mEditorPlaceHolder.showEditor(filter.getEditingViewId());
                     mCurrentImage = mCurrentEditor.getImageShow();