[shell] fix eclipse-theia#4697: reset prevent close on keyup and befo…

…reunload Signed-off-by: Anton Kosyakov <anton.kosyakov@typefox.io>
yaweiw · Mar 25, 2019 · 5cbb4f1 · 5cbb4f1
1 parent 4d74d28
commit 5cbb4f1
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/packages/core/src/browser/common-frontend-contribution.ts b/packages/core/src/browser/common-frontend-contribution.ts
@@ -599,16 +599,18 @@ export class CommonFrontendContribution implements FrontendApplicationContributi
             this.shouldPreventClose = isCtrlCmd(event) || event.code === 'KeyW';
         });
 
-        window.document.addEventListener('keyup', event => {
-            if (isCtrlCmd(event) || event.code === 'KeyW') {
-                this.shouldPreventClose = false;
-            }
+        window.document.addEventListener('keyup', () => {
+            this.shouldPreventClose = false;
         });
     }
 
     onWillStop() {
-        if (this.shouldPreventClose || this.shell.canSaveAll()) {
-            return true;
+        try {
+            if (this.shouldPreventClose || this.shell.canSaveAll()) {
+                return true;
+            }
+        } finally {
+            this.shouldPreventClose = false;
         }
     }
 }