commit 407d60623860a53780a53edac81f39193da44126
author Ruben Brunk <rubenbrunk@google.com> Tue Jan 29 00:54:58 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 29 00:54:58 2013 +0000
tree db29a95e83491823819e54f1871320a87aa9bf1a
parent 5a1fcd84b353eda4c283c04cb656a51e6069bec7
parent 4906a4d1f5167b4911627e692aef82e486eeea5a

Merge "Fixed BasicEditor NPE." into gb-ub-photos-bryce

src/com/android/gallery3d/filtershow/editors/BasicEditor.java

diff --git a/src/com/android/gallery3d/filtershow/editors/BasicEditor.java b/src/com/android/gallery3d/filtershow/editors/BasicEditor.java
index c28a564..3a15cf6 100644
--- a/src/com/android/gallery3d/filtershow/editors/BasicEditor.java
+++ b/src/com/android/gallery3d/filtershow/editors/BasicEditor.java
@@ -64,6 +64,9 @@
     @Override
     public void onProgressChanged(SeekBar sbar, int progress, boolean arg2) {
         ImageFilter filter = mImageShow.getCurrentFilter();
+        if (filter == null) {
+            return;
+        }
         int minp = filter.getMinParameter();
         int value = progress + minp;
         mImageShow.onNewValue(value);