aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/features/conference/components/Conference.js6
-rw-r--r--app/preload/preload.js3
2 files changed, 8 insertions, 1 deletions
diff --git a/app/features/conference/components/Conference.js b/app/features/conference/components/Conference.js
index bd0fc22..82b184d 100644
--- a/app/features/conference/components/Conference.js
+++ b/app/features/conference/components/Conference.js
@@ -266,7 +266,11 @@ class Conference extends Component<Props, State> {
setupAlwaysOnTopRender(this._api);
}
- setupWiFiStats(iframe);
+ // Disable WiFiStats on mac due to jitsi-meet-electron#585
+ if (window.jitsiNodeAPI.platform !== 'darwin') {
+ setupWiFiStats(iframe);
+ }
+
setupPowerMonitorRender(this._api);
}
diff --git a/app/preload/preload.js b/app/preload/preload.js
index ccc65cc..e8d8020 100644
--- a/app/preload/preload.js
+++ b/app/preload/preload.js
@@ -1,3 +1,5 @@
+/* global process */
+
const createElectronStorage = require('redux-persist-electron-storage');
const { ipcRenderer, remote } = require('electron');
const os = require('os');
@@ -11,6 +13,7 @@ window.jitsiNodeAPI = {
createElectronStorage,
osUserInfo: os.userInfo,
openExternalLink,
+ platform: process.platform,
jitsiMeetElectronUtils,
getLocale: remote.app.getLocale,
ipc: {