diff --git a/src/renderer/controllers/playback-controller.js b/src/renderer/controllers/playback-controller.js index c1781895..4bdadf76 100644 --- a/src/renderer/controllers/playback-controller.js +++ b/src/renderer/controllers/playback-controller.js @@ -93,6 +93,10 @@ module.exports = class PlaybackController { // Skip (aka seek) to a specific point, in seconds skipTo (time) { + if (!Number.isFinite(time)) { + console.error('Tried to skip to a non-finite time ' + time) + return console.trace() + } if (isCasting(this.state)) Cast.seek(time) else this.state.playing.jumpToTime = time } diff --git a/src/renderer/controllers/torrent-list-controller.js b/src/renderer/controllers/torrent-list-controller.js index 5ad278e2..dc9fe9cc 100644 --- a/src/renderer/controllers/torrent-list-controller.js +++ b/src/renderer/controllers/torrent-list-controller.js @@ -263,7 +263,7 @@ function deleteFile (path) { // Delete all files in a torrent function moveItemToTrash (torrentSummary) { var filePath = TorrentSummary.getFileOrFolder(torrentSummary) - ipcRenderer.send('moveItemToTrash', filePath) + if (filePath) ipcRenderer.send('moveItemToTrash', filePath) } function showItemInFolder (torrentSummary) { diff --git a/src/renderer/lib/cast.js b/src/renderer/lib/cast.js index 2bb8dc2c..180c833e 100644 --- a/src/renderer/lib/cast.js +++ b/src/renderer/lib/cast.js @@ -396,7 +396,9 @@ function stop () { function stoppedCasting () { state.playing.location = 'local' - state.playing.jumpToTime = state.playing.currentTime + state.playing.jumpToTime = Number.isFinite(state.playing.currentTime) + ? state.playing.currentTime + : 0 update() } diff --git a/src/renderer/lib/torrent-summary.js b/src/renderer/lib/torrent-summary.js index fd5b0d80..9b0e3c6a 100644 --- a/src/renderer/lib/torrent-summary.js +++ b/src/renderer/lib/torrent-summary.js @@ -52,5 +52,6 @@ function getByKey (state, torrentKey) { // module. Store root folder explicitly to avoid hacky path processing below. function getFileOrFolder (torrentSummary) { var ts = torrentSummary + if (!ts.path || !ts.files || ts.files.length === 0) return null return path.join(ts.path, ts.files[0].path.split('/')[0]) }