summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/filtershow/PanelController.java
diff options
context:
space:
mode:
authornicolasroard <nicolasroard@google.com>2013-04-09 17:52:08 -0700
committernicolasroard <nicolasroard@google.com>2013-04-09 17:52:08 -0700
commitc79fcc2ee8741705fc00849c66d06561f2219fc7 (patch)
treeac0bc40845d970ea9645b6643b18e15778f7515c /src/com/android/gallery3d/filtershow/PanelController.java
parentd6448052595a2bef9a69a93a01ef74e331288484 (diff)
downloadandroid_packages_apps_Snap-c79fcc2ee8741705fc00849c66d06561f2219fc7.tar.gz
android_packages_apps_Snap-c79fcc2ee8741705fc00849c66d06561f2219fc7.tar.bz2
android_packages_apps_Snap-c79fcc2ee8741705fc00849c66d06561f2219fc7.zip
Detach old editor
Change-Id: I1b0a30aa334a83011d9f03ea629e1b0f36ea21d2
Diffstat (limited to 'src/com/android/gallery3d/filtershow/PanelController.java')
-rw-r--r--src/com/android/gallery3d/filtershow/PanelController.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/filtershow/PanelController.java b/src/com/android/gallery3d/filtershow/PanelController.java
index f29765a35..1d0118f85 100644
--- a/src/com/android/gallery3d/filtershow/PanelController.java
+++ b/src/com/android/gallery3d/filtershow/PanelController.java
@@ -359,7 +359,6 @@ public class PanelController implements OnClickListener {
if (mCurrentEditor != null) {
mCurrentEditor.reflectCurrentFilter();
}
-
}
}
@@ -590,6 +589,9 @@ public class PanelController implements OnClickListener {
mUtilityPanel.showMenu(false);
if (view instanceof FilterIconButton) {
+ if (mCurrentEditor != null) {
+ mCurrentEditor.detach();
+ }
mCurrentEditor = null;
FilterIconButton component = (FilterIconButton) view;
FilterRepresentation representation = component.getFilterRepresentation();