From 50ffa17594ab620b62db0cbb98d0b3a0fb4ac4fc Mon Sep 17 00:00:00 2001
From: nicolasroard <nicolasroard@google.com>
Date: Fri, 8 Feb 2013 17:48:54 -0800
Subject: [PATCH] Fix crash when reset

Change-Id: Ibab01c4e218e30f3f4a67665d99dbc14bdc7d8ea
---
 src/com/android/gallery3d/filtershow/PanelController.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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