summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d
diff options
context:
space:
mode:
authornicolasroard <nicolasroard@google.com>2013-11-04 21:53:53 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-04 21:53:53 -0800
commit779a63b39a02ca11c454304ab21f3f3834e4a9fd (patch)
treec4dcdc2d78827d04e6ef53a6ce0b91fea45e8731 /src/com/android/gallery3d
parent8d879c8edb474b4c493b59823489357739e771c1 (diff)
parent350f7e3de777fdb331494ea5efb08809e46f980b (diff)
downloadandroid_packages_apps_Gallery2-779a63b39a02ca11c454304ab21f3f3834e4a9fd.tar.gz
android_packages_apps_Gallery2-779a63b39a02ca11c454304ab21f3f3834e4a9fd.tar.bz2
android_packages_apps_Gallery2-779a63b39a02ca11c454304ab21f3f3834e4a9fd.zip
am 350f7e3d: am 00dfa8a1: am 1619b3c3: Fix infinite spinner dialog
* commit '350f7e3de777fdb331494ea5efb08809e46f980b': Fix infinite spinner dialog
Diffstat (limited to 'src/com/android/gallery3d')
-rw-r--r--src/com/android/gallery3d/filtershow/pipeline/ProcessingService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/filtershow/pipeline/ProcessingService.java b/src/com/android/gallery3d/filtershow/pipeline/ProcessingService.java
index b5b636ec2..e5736d43c 100644
--- a/src/com/android/gallery3d/filtershow/pipeline/ProcessingService.java
+++ b/src/com/android/gallery3d/filtershow/pipeline/ProcessingService.java
@@ -288,7 +288,7 @@ public class ProcessingService extends Service {
if (mNeedsAlive) {
// If the app has been restarted while we were saving...
mFiltershowActivity.updateUIAfterServiceStarted();
- } else if (mFiltershowActivity.isSimpleEditAction()) {
+ } else if (exit || mFiltershowActivity.isSimpleEditAction()) {
// terminate now
mFiltershowActivity.completeSaveImage(result);
}