From b87650e6dcd9aa7cffa7380f228c0e21e9e106de Mon Sep 17 00:00:00 2001
From: pabloFuente <pablofuenteperez@gmail.com>
Date: Mon, 3 Jun 2019 12:50:23 +0200
Subject: [PATCH] openvidu-electron: fix for OSX (close event not firing for
 BrowserWindow)

---
 openvidu-electron/src/app.js | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/openvidu-electron/src/app.js b/openvidu-electron/src/app.js
index 6f34d22f..2be491ab 100644
--- a/openvidu-electron/src/app.js
+++ b/openvidu-electron/src/app.js
@@ -4,11 +4,15 @@ const BrowserWindow = require('electron').remote.BrowserWindow;
 var openvidu;
 var session;
 var publisher;
-var screenId;
 var mySessionId;
 
 ipcRenderer.on('screen-share-ready', (event, message) => {
-    screenId = message;
+    // User has chosen a screen to share. screenId is message parameter
+    showSession();
+    publisher = openvidu.initPublisher("publisher", {
+        videoSource: "screen:" + message
+    });
+    joinSession();
 });
 
 function initPublisher() {
@@ -76,15 +80,6 @@ function openScreenShareModal() {
     })
     win.setMenu(null);
     // win.webContents.openDevTools();
-    win.on('close', async () => {
-        if (!!screenId) {
-            showSession();
-            publisher = openvidu.initPublisher("publisher", {
-                videoSource: "screen:" + screenId
-            });
-            joinSession();
-        }
-    });
 
     var theUrl = 'file://' + __dirname + '/modal.html'
     win.loadURL(theUrl);