Merge pull request #552 from nos/develop

[Release] Version 0.3.0 (redo)
nos · Sep 17, 2018 · e40a0fd · e40a0fd
2 parents 86c113b + eedc731
commit e40a0fd
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -145,6 +145,12 @@ workflows:
               ignore: /.*/
             tags:
               only: /[0-9]+(\.[0-9]+)+.*/
+      - deploy_win32:
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /[0-9]+(\.[0-9]+)+.*/
       - deploy_linux:
           filters:
             branches:

diff --git a/src/main/util/bindMenus.js b/src/main/util/bindMenus.js
@@ -10,6 +10,7 @@ const NULL_WEBVIEW = {
   isDevToolsOpened: () => false,
   goBack: noop,
   goForward: noop,
+  reload: noop,
   on: noop,
   addListener: noop,
   removeListener: noop

diff --git a/static/preloadRenderer.js b/static/preloadRenderer.js
@@ -10,16 +10,17 @@ function createDelegate(channel) {
     const successChannel = `${channel}-success-${id}`;
     const failureChannel = `${channel}-failure-${id}`;
 
-    try {
-      ipcRenderer.once(successChannel, (event, ...successArgs) => resolve(...successArgs));
-      ipcRenderer.once(failureChannel, (event, message) => reject(new Error(message)));
-      ipcRenderer.sendToHost(channel, id, ...args);
-    } catch (err) {
-      reject(err);
-    } finally {
-      ipcRenderer.removeAllListeners(successChannel);
+    ipcRenderer.once(successChannel, (event, ...successArgs) => {
       ipcRenderer.removeAllListeners(failureChannel);
-    }
+      resolve(...successArgs);
+    });
+
+    ipcRenderer.once(failureChannel, (event, message) => {
+      ipcRenderer.removeAllListeners(successChannel);
+      reject(new Error(message));
+    });
+
+    ipcRenderer.sendToHost(channel, id, ...args);
   });
 }