From ef51f827dce4a3d94b10f6f1cba460096d1d5b58 Mon Sep 17 00:00:00 2001 From: Feross Aboukhadijeh Date: Thu, 28 Apr 2016 12:10:24 +0200 Subject: [PATCH 1/3] fix exception in webtorrent process --- renderer/webtorrent.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renderer/webtorrent.js b/renderer/webtorrent.js index 26338ac2..d90458fc 100644 --- a/renderer/webtorrent.js +++ b/renderer/webtorrent.js @@ -90,7 +90,7 @@ function startTorrenting (torrentKey, torrentID, path, fileModtimes) { function stopTorrenting (infoHash) { var torrent = client.get(infoHash) - torrent.destroy() + if (torrent) torrent.destroy() } // Create a new torrent, start seeding From 7624f2da98b23e7d4eb96b404f645f5beb3cd591 Mon Sep 17 00:00:00 2001 From: Feross Aboukhadijeh Date: Thu, 28 Apr 2016 12:14:39 +0200 Subject: [PATCH 2/3] fixes for cross-zip@2 --- bin/package.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/package.js b/bin/package.js index 1c0fc89d..298fc84b 100755 --- a/bin/package.js +++ b/bin/package.js @@ -277,7 +277,7 @@ function buildDarwin (cb) { var inPath = path.join(buildPath[0], config.APP_NAME + '.app') var outPath = path.join(DIST_PATH, BUILD_NAME + '-darwin.zip') - zip(inPath, outPath) + zip.zipSync(inPath, outPath) console.log('OS X: Created zip.') } @@ -391,7 +391,7 @@ function buildWin32 (cb) { var inPath = path.join(DIST_PATH, path.basename(buildPath[0])) var outPath = path.join(DIST_PATH, BUILD_NAME + '-win.zip') - zip(inPath, outPath) + zip.zipSync(inPath, outPath) console.log('Windows: Created portable app.') cb(null) @@ -455,7 +455,7 @@ function buildLinux (cb) { var inPath = path.join(DIST_PATH, path.basename(filesPath)) var outPath = path.join(DIST_PATH, BUILD_NAME + '-linux-' + destArch + '.zip') - zip(inPath, outPath) + zip.zipSync(inPath, outPath) console.log(`Linux: Created ${destArch} zip.`) cb(null) From fdd7dab76f26ae69810296ce64e0431efa307ee4 Mon Sep 17 00:00:00 2001 From: Feross Aboukhadijeh Date: Thu, 28 Apr 2016 12:18:31 +0200 Subject: [PATCH 3/3] electron-winstaller@2.3.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 123db968..41bdf947 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "cross-zip": "^2.0.1", "electron-osx-sign": "^0.3.0", "electron-packager": "^7.0.0", - "electron-winstaller": "feross/windows-installer#build", + "electron-winstaller": "^2.3.0", "gh-release": "^2.0.3", "minimist": "^1.2.0", "nobin-debian-installer": "^0.0.9",