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 6694e37..2a97e7e 100644 (file)
--- 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();