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 | 2251adcd841d597eb6673fc6d2810979753ceb73 (patch) | |
| tree | f8d430ae8bcb379270a0173ef759273858ba2ace | |
| parent | 7805371bbe17bca129bfd1902f23227b27312854 (diff) | |
| parent | e30ec70e8d4064b1c2da824aae5cf3d11c86cc5e (diff) | |
| download | android_packages_apps_Gallery2-2251adcd841d597eb6673fc6d2810979753ceb73.tar.gz android_packages_apps_Gallery2-2251adcd841d597eb6673fc6d2810979753ceb73.tar.bz2 android_packages_apps_Gallery2-2251adcd841d597eb6673fc6d2810979753ceb73.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); |