From 1e50e2dd6dfe51cdecf601709844a46d24d8d43e Mon Sep 17 00:00:00 2001 From: AkiraFukushima Date: Tue, 18 Dec 2018 23:12:18 +0900 Subject: [PATCH] refs #769 Switch local streaming method --- src/main/index.js | 9 +++++---- src/renderer/store/TimelineSpace.js | 5 ++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/index.js b/src/main/index.js index f2775c3a..0666d862 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -469,20 +469,21 @@ ipcMain.on('stop-directmessages-streaming', (event, _) => { let localStreaming = null -ipcMain.on('start-local-streaming', (event, ac) => { - accountManager.getAccount(ac._id) +ipcMain.on('start-local-streaming', (event, obj) => { + const { account, useWebsocket } = obj + accountManager.getAccount(account._id) .catch((err) => { log.error(err) event.sender.send('error-start-local-streaming', err) }) - .then((account) => { + .then((acct) => { // Stop old local streaming if (localStreaming !== null) { localStreaming.stop() localStreaming = null } - localStreaming = new StreamingManager(account) + localStreaming = new StreamingManager(acct, useWebsocket) localStreaming.start( 'public/local', '', diff --git a/src/renderer/store/TimelineSpace.js b/src/renderer/store/TimelineSpace.js index 6b1b22f0..bbf2556a 100644 --- a/src/renderer/store/TimelineSpace.js +++ b/src/renderer/store/TimelineSpace.js @@ -276,7 +276,10 @@ const TimelineSpace = { }, startLocalStreaming ({ state }) { return new Promise((resolve, reject) => { - ipcRenderer.send('start-local-streaming', state.account) + ipcRenderer.send('start-local-streaming', { + account: state.account, + useWebsocket: state.useWebsocket + }) ipcRenderer.once('error-start-local-streaming', (event, err) => { reject(err) })