From 58c904fe01bf33f955c19305451ecf33f9fb2868 Mon Sep 17 00:00:00 2001
From: Quang Lam <quang.lam2807@gmail.com>
Date: Sat, 15 Feb 2020 14:26:37 -0600
Subject: [PATCH] Fix context menu doesn't work when multiple windows are open
 (#135)

---
 public/preload/about.js                | 7 +++++++
 public/preload/add-workspace.js        | 5 ++++-
 public/preload/code-injection.js       | 5 ++++-
 public/preload/custom-user-agent.js    | 5 ++++-
 public/preload/edit-workspace.js       | 5 ++++-
 public/preload/go-to-url.js            | 5 ++++-
 public/preload/license-registration.js | 5 ++++-
 public/preload/main.js                 | 5 ++++-
 public/preload/menubar.js              | 5 ++++-
 9 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/public/preload/about.js b/public/preload/about.js
index 3a7b0ce5..80032050 100644
--- a/public/preload/about.js
+++ b/public/preload/about.js
@@ -3,3 +3,10 @@ const path = require('path');
 window.mode = 'about';
 
 window.iconPath = path.join(__dirname, '..', 'icon.png');
+
+const { remote } = require('electron');
+const contextMenu = require('electron-context-menu');
+
+contextMenu({
+  window: remote.getCurrentWindow(),
+});
diff --git a/public/preload/add-workspace.js b/public/preload/add-workspace.js
index 65ee3cd5..12681162 100644
--- a/public/preload/add-workspace.js
+++ b/public/preload/add-workspace.js
@@ -1,5 +1,8 @@
 window.mode = 'add-workspace';
 
+const { remote } = require('electron');
 const contextMenu = require('electron-context-menu');
 
-contextMenu();
+contextMenu({
+  window: remote.getCurrentWindow(),
+});
diff --git a/public/preload/code-injection.js b/public/preload/code-injection.js
index a52390ce..88aebf19 100644
--- a/public/preload/code-injection.js
+++ b/public/preload/code-injection.js
@@ -1,5 +1,8 @@
 window.mode = 'code-injection';
 
+const { remote } = require('electron');
 const contextMenu = require('electron-context-menu');
 
-contextMenu();
+contextMenu({
+  window: remote.getCurrentWindow(),
+});
diff --git a/public/preload/custom-user-agent.js b/public/preload/custom-user-agent.js
index bf9e6e4d..077f8ce2 100644
--- a/public/preload/custom-user-agent.js
+++ b/public/preload/custom-user-agent.js
@@ -1,5 +1,8 @@
 window.mode = 'custom-user-agent';
 
+const { remote } = require('electron');
 const contextMenu = require('electron-context-menu');
 
-contextMenu();
+contextMenu({
+  window: remote.getCurrentWindow(),
+});
diff --git a/public/preload/edit-workspace.js b/public/preload/edit-workspace.js
index 38eff054..341fec78 100644
--- a/public/preload/edit-workspace.js
+++ b/public/preload/edit-workspace.js
@@ -1,5 +1,8 @@
 window.mode = 'edit-workspace';
 
+const { remote } = require('electron');
 const contextMenu = require('electron-context-menu');
 
-contextMenu();
+contextMenu({
+  window: remote.getCurrentWindow(),
+});
diff --git a/public/preload/go-to-url.js b/public/preload/go-to-url.js
index cb1d6d41..9a4ca612 100644
--- a/public/preload/go-to-url.js
+++ b/public/preload/go-to-url.js
@@ -1,5 +1,8 @@
 window.mode = 'go-to-url';
 
+const { remote } = require('electron');
 const contextMenu = require('electron-context-menu');
 
-contextMenu();
+contextMenu({
+  window: remote.getCurrentWindow(),
+});
diff --git a/public/preload/license-registration.js b/public/preload/license-registration.js
index a46ab686..c30ec625 100644
--- a/public/preload/license-registration.js
+++ b/public/preload/license-registration.js
@@ -1,5 +1,8 @@
 window.mode = 'license-registration';
 
+const { remote } = require('electron');
 const contextMenu = require('electron-context-menu');
 
-contextMenu();
+contextMenu({
+  window: remote.getCurrentWindow(),
+});
diff --git a/public/preload/main.js b/public/preload/main.js
index 5b6828ce..569c5293 100644
--- a/public/preload/main.js
+++ b/public/preload/main.js
@@ -1,5 +1,8 @@
 window.mode = 'main';
 
+const { remote } = require('electron');
 const contextMenu = require('electron-context-menu');
 
-contextMenu();
+contextMenu({
+  window: remote.getCurrentWindow(),
+});
diff --git a/public/preload/menubar.js b/public/preload/menubar.js
index f0fa9574..d7e4bec7 100644
--- a/public/preload/menubar.js
+++ b/public/preload/menubar.js
@@ -1,5 +1,8 @@
 window.mode = 'menubar';
 
+const { remote } = require('electron');
 const contextMenu = require('electron-context-menu');
 
-contextMenu();
+contextMenu({
+  window: remote.getCurrentWindow(),
+});