diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2013-01-29 00:54:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-01-29 00:54:58 +0000 |
| commit | 407d60623860a53780a53edac81f39193da44126 (patch) | |
| tree | db29a95e83491823819e54f1871320a87aa9bf1a | |
| parent | 5a1fcd84b353eda4c283c04cb656a51e6069bec7 (diff) | |
| parent | 4906a4d1f5167b4911627e692aef82e486eeea5a (diff) | |
| download | android_packages_apps_Snap-407d60623860a53780a53edac81f39193da44126.tar.gz android_packages_apps_Snap-407d60623860a53780a53edac81f39193da44126.tar.bz2 android_packages_apps_Snap-407d60623860a53780a53edac81f39193da44126.zip | |
Merge "Fixed BasicEditor NPE." into gb-ub-photos-bryce
| -rw-r--r-- | src/com/android/gallery3d/filtershow/editors/BasicEditor.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/filtershow/editors/BasicEditor.java b/src/com/android/gallery3d/filtershow/editors/BasicEditor.java index c28a56438..3a15cf68d 100644 --- a/src/com/android/gallery3d/filtershow/editors/BasicEditor.java +++ b/src/com/android/gallery3d/filtershow/editors/BasicEditor.java @@ -64,6 +64,9 @@ public class BasicEditor extends Editor implements OnSeekBarChangeListener { @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); |