fix: inheritance of webPreferences sub properties

electron · Aug 22, 2018 · ef0a6d9 · ef0a6d9
1 parent 4c7af6a
commit ef0a6d9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/browser/guest-window-manager.js b/lib/browser/guest-window-manager.js
@@ -27,11 +27,11 @@ const mergeOptions = function (child, parent, visited) {
   for (const key in parent) {
     if (key === 'isBrowserView') continue
     if (!hasProp.call(parent, key)) continue
-    if (key in child) continue
+    if (key in child && key !== 'webPreferences') continue
 
     const value = parent[key]
     if (typeof value === 'object') {
-      child[key] = mergeOptions({}, value, visited)
+      child[key] = mergeOptions(child[key] || {}, value, visited)
     } else {
       child[key] = value
     }