summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authornicolasroard <nicolasroard@google.com>2013-02-08 17:48:54 -0800
committernicolasroard <nicolasroard@google.com>2013-02-08 17:48:54 -0800
commitc21332d00abceb1959fc43be2986a6c3d27a6707 (patch)
tree73e88f736d27251ba45c6795d56a0f5e58ec6c19 /src
parentb00a8188613462320491e5edad5feb6e7c01f788 (diff)
downloadandroid_packages_apps_Snap-c21332d00abceb1959fc43be2986a6c3d27a6707.tar.gz
android_packages_apps_Snap-c21332d00abceb1959fc43be2986a6c3d27a6707.tar.bz2
android_packages_apps_Snap-c21332d00abceb1959fc43be2986a6c3d27a6707.zip
Fix crash when reset
Change-Id: Ibab01c4e218e30f3f4a67665d99dbc14bdc7d8ea
Diffstat (limited to 'src')
-rw-r--r--src/com/android/gallery3d/filtershow/PanelController.java2
1 files changed, 1 insertions, 1 deletions
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();