From 592d29c7148cc9c092d60715b4613ca4ad945a23 Mon Sep 17 00:00:00 2001 From: Kylart Date: Fri, 28 Aug 2020 16:52:21 +0200 Subject: [PATCH] Fix bug where file streamed would always be shown when playing local files afterwards --- src/main/services/streaming/index.js | 7 ++++++- src/renderer/components/local/card.vue | 3 ++- src/renderer/store/modules/streaming/actions.js | 7 +++---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/main/services/streaming/index.js b/src/main/services/streaming/index.js index c52e614..5582df3 100644 --- a/src/main/services/streaming/index.js +++ b/src/main/services/streaming/index.js @@ -22,7 +22,12 @@ function init (event, { link }) { const server = createServer(file) server.listen() - event.sender.send(events.init.success, { torrent: link, name: file.name, path: file.path, port: server.address().port }) + event.sender.send(events.init.success, { + link, + name: file.name, + path: file.path, + port: server.address().port + }) }) // Pause/Resume downloading as needed diff --git a/src/renderer/components/local/card.vue b/src/renderer/components/local/card.vue index d75c5f8..467f8e5 100644 --- a/src/renderer/components/local/card.vue +++ b/src/renderer/components/local/card.vue @@ -184,7 +184,8 @@ export default { this.$store.dispatch('streaming/play', { link: this.path, name: this.title, - neighbours: null + neighbours: null, + isTorrent: false }) } else { this.$electron.shell.openItem(this.path) diff --git a/src/renderer/store/modules/streaming/actions.js b/src/renderer/store/modules/streaming/actions.js index 237e5ae..ec7be4e 100644 --- a/src/renderer/store/modules/streaming/actions.js +++ b/src/renderer/store/modules/streaming/actions.js @@ -16,13 +16,12 @@ export default { } const event = eventsList.streaming.init - const handler = (e, data) => { + + ipcRenderer.once(event.success, (e, data) => { commit('setPlayer', { ...data, show: true, isTorrent }) dispatch('getNeighbours') - ipcRenderer.removeListener(event.success, handler) - } + }) - ipcRenderer.on(event.success, handler) ipcRenderer.send(event.main, opts) }, getNeighbours ({ rootState, state, commit, rootGetters }) {