diff options
Diffstat (limited to 'java/org')
| -rw-r--r-- | java/org/gnu/emacs/EmacsWindowManager.java | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/java/org/gnu/emacs/EmacsWindowManager.java b/java/org/gnu/emacs/EmacsWindowManager.java index a239fdc8ac2..41ea3a15809 100644 --- a/java/org/gnu/emacs/EmacsWindowManager.java +++ b/java/org/gnu/emacs/EmacsWindowManager.java | |||
| @@ -221,11 +221,14 @@ public final class EmacsWindowManager | |||
| 221 | { | 221 | { |
| 222 | consumer.detachWindow (); | 222 | consumer.detachWindow (); |
| 223 | 223 | ||
| 224 | /* Though pruneWindows will likely remove the same windows, call | 224 | /* Though pruneWindows will likely remove the same window(s), |
| 225 | onActivityDetached anyway if isFinishing is set, as in | 225 | call onActivityDetached anyway if isFinishing is set, if |
| 226 | obscure circumstances pruneWindows will not remove frames | 226 | CONSUMER not be a multitasking activity, as in obscure |
| 227 | bound to the system-started task. */ | 227 | circumstances pruneWindows will not remove frames bound to |
| 228 | if (isFinishing) | 228 | the system-started task. */ |
| 229 | if (isFinishing | ||
| 230 | && (!(consumer instanceof EmacsMultitaskActivity) | ||
| 231 | || Build.VERSION.SDK_INT < Build.VERSION_CODES.Q)) | ||
| 229 | window.onActivityDetached (); | 232 | window.onActivityDetached (); |
| 230 | } | 233 | } |
| 231 | 234 | ||