From 3a1fa25106b147c857a316e5f8216016bbdb605a Mon Sep 17 00:00:00 2001 From: Feross Aboukhadijeh Date: Thu, 26 May 2016 15:42:12 -0700 Subject: [PATCH 1/2] Re-enable WebRTC peers (OS X, Windows) --- renderer/webtorrent.js | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/renderer/webtorrent.js b/renderer/webtorrent.js index 6ccb203c..63e2a72f 100644 --- a/renderer/webtorrent.js +++ b/renderer/webtorrent.js @@ -28,16 +28,7 @@ global.WEBTORRENT_ANNOUNCE = defaultAnnounceList // Connect to the WebTorrent and BitTorrent networks. WebTorrent Desktop is a hybrid // client, as explained here: https://webtorrent.io/faq -var client = window.client = new WebTorrent({ - tracker: { - // HACK: OS X: Disable WebRTC peers to fix 100% CPU issue caused by Chrome bug. - // Fixed in Chrome 51, so we can remove this hack once Electron updates Chrome. - // Issue: https://github.com/feross/webtorrent-desktop/issues/353 - // HACK #2: Windows: Disable WebRTC to fix Chrome 50 / Electron 1.1.[1-3] crash. - // Issue: https://github.com/electron/electron/issues/5629 - wrtc: process.platform === 'linux' - } -}) +var client = new WebTorrent() // WebTorrent-to-HTTP streaming sever var server = window.server = null From 0d92dee14e58f64e18ecba217ffe3b34a140e420 Mon Sep 17 00:00:00 2001 From: Feross Aboukhadijeh Date: Thu, 26 May 2016 15:42:18 -0700 Subject: [PATCH 2/2] style --- renderer/webtorrent.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/renderer/webtorrent.js b/renderer/webtorrent.js index 63e2a72f..642f5fa1 100644 --- a/renderer/webtorrent.js +++ b/renderer/webtorrent.js @@ -31,10 +31,10 @@ global.WEBTORRENT_ANNOUNCE = defaultAnnounceList var client = new WebTorrent() // WebTorrent-to-HTTP streaming sever -var server = window.server = null +var server = null // Used for diffing, so we only send progress updates when necessary -var prevProgress = window.prevProgress = null +var prevProgress = null init()