macOS: Another fix for weirdness with menubar shortcuts

charlielee · Mar 22, 2021 · 50915e4 · 50915e4
1 parent dd4b4b9
commit 50915e4
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/js/main/MenuBar.js b/src/js/main/MenuBar.js
@@ -92,7 +92,7 @@
               label: "Delete Last Frame",
               click: function (_menuItem, _browserWindow, e) {
                 // Workaround for `registerAccelerator: false` not working on macOS
-                if (!e.triggeredByAccelerator) {
+                if (!e.triggeredByAccelerator || !_browserWindow) {
                   self._sendClickEvent("undoFrame");
                 }
               },
@@ -109,7 +109,7 @@
             {
               label: "Capture Frame",
               click: function (_menuItem, _browserWindow, e) {
-                if (!e.triggeredByAccelerator) {
+                if (!e.triggeredByAccelerator || !_browserWindow) {
                   self._sendClickEvent("takePicture");
                 }
               },
@@ -126,7 +126,7 @@
             {
               label: "Play Capture Sounds",
               click: function (_menuItem, _browserWindow, e) {
-                if (!e.triggeredByAccelerator) {
+                if (!e.triggeredByAccelerator || !_browserWindow) {
                   self._sendClickEvent("audioToggle");
                 }
               },
@@ -150,7 +150,7 @@
             {
               label: "Loop Playback",
               click: function (_menuItem, _browserWindow, e) {
-                if (!e.triggeredByAccelerator) {
+                if (!e.triggeredByAccelerator || !_browserWindow) {
                   self._sendClickEvent("loopPlayback");
                 }
               },
@@ -163,7 +163,7 @@
             {
               label: "Display First Frame",
               click: function (_menuItem, _browserWindow, e) {
-                if (!e.triggeredByAccelerator) {
+                if (!e.triggeredByAccelerator || !_browserWindow) {
                   self._sendClickEvent("firstFrame");
                 }
               },
@@ -173,7 +173,7 @@
             {
               label: "Display Last Frame",
               click: function (_menuItem, _browserWindow, e) {
-                if (!e.triggeredByAccelerator) {
+                if (!e.triggeredByAccelerator || !_browserWindow) {
                   self._sendClickEvent("lastFrame");
                 }
               },