summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher2/Launcher.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index cbf09b0b0..859a75e5c 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -831,6 +831,9 @@ public final class Launcher extends Activity
} catch (Exception e) {
// An exception is thrown if the dialog is not visible, which is fine
}
+
+ // Whatever we were doing is hereby canceled.
+ mWaitingForResult = false;
}
@Override
@@ -839,11 +842,9 @@ public final class Launcher extends Activity
// Close the menu
if (Intent.ACTION_MAIN.equals(intent.getAction())) {
+ // also will cancel mWaitingForResult.
closeSystemDialogs();
- // Whatever we were doing is hereby canceled.
- mWaitingForResult = false;
-
// Set this flag so that onResume knows to close the search dialog if it's open,
// because this was a new intent (thus a press of 'home' or some such) rather than
// for example onResume being called when the user pressed the 'back' button.