Skip to content

Commit 69eb032

Browse files
authored
1 parent 091e3de commit 69eb032

File tree

5 files changed

+10
-9
lines changed

5 files changed

+10
-9
lines changed

.yarnrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
disturl "https://atom.io/download/electron"
2-
target "7.2.2"
2+
target "7.2.4"
33
runtime "electron"

cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@
6060
"git": {
6161
"name": "electron",
6262
"repositoryUrl": "https://github.com/electron/electron",
63-
"commitHash": "959e80cc53cbebf8eb1d62eb2d14fa8fd86b0394"
63+
"commitHash": "0552e0d5de46ffa3b481d741f1db5c779e201565"
6464
}
6565
},
6666
"isOnlyProductionDependency": true,
6767
"license": "MIT",
68-
"version": "7.2.2"
68+
"version": "7.2.4"
6969
},
7070
{
7171
"component": {

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
"css-loader": "^3.2.0",
102102
"debounce": "^1.0.0",
103103
"deemon": "^1.4.0",
104-
"electron": "7.2.2",
104+
"electron": "7.2.4",
105105
"eslint": "6.8.0",
106106
"eslint-plugin-jsdoc": "^19.1.0",
107107
"event-stream": "3.3.4",

src/vs/platform/menubar/electron-main/menubar.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -702,7 +702,8 @@ export class Menubar {
702702
}
703703

704704
// DevTools focused
705-
if (activeWindow.webContents.isDevToolsFocused()) {
705+
if (activeWindow.webContents.isDevToolsFocused() &&
706+
activeWindow.webContents.devToolsWebContents) {
706707
return contextSpecificHandlers.inDevTools(activeWindow.webContents.devToolsWebContents);
707708
}
708709

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2715,10 +2715,10 @@ electron-to-chromium@^1.2.7:
27152715
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.27.tgz#78ecb8a399066187bb374eede35d9c70565a803d"
27162716
integrity sha1-eOy4o5kGYYe7N07t412ccFZagD0=
27172717

2718-
2719-
version "7.2.2"
2720-
resolved "https://registry.yarnpkg.com/electron/-/electron-7.2.2.tgz#92b159fa6e6c31dfcfe0c2818c7baacb81fa1c5f"
2721-
integrity sha512-8ppCjch2LRbi5JJ9D+gn+Q9erShNLDcN5ODRAPr/MAHqhTTlGBqCcvNMlCzRCEVV75PouKxVm7NjSKXBYlD9QA==
2718+
2719+
version "7.2.4"
2720+
resolved "https://registry.yarnpkg.com/electron/-/electron-7.2.4.tgz#9fc0446dae23ead897af8742470cb18da55c6ce9"
2721+
integrity sha512-Z+R692uTzXgP8AHrabE+kkrMlQJ6pnAYoINenwj9QSqaD2YbO8IuXU9DMCcUY0+VpA91ee09wFZJNUKYPMnCKg==
27222722
dependencies:
27232723
"@electron/get" "^1.0.1"
27242724
"@types/node" "^12.0.12"

0 commit comments

Comments
 (0)