merged with latest master

This commit is contained in:
Alberto Miranda
2016-07-17 20:57:06 -03:00
parent c7626997de
commit 7677bff6d4
2 changed files with 13 additions and 5 deletions

View File

@@ -166,10 +166,6 @@ function updateElectron () {
}
}
function getOpenInVlc () {
return state.saved.prefs.playInVlc
}
const dispatchHandlers = {
// Torrent list: creating, deleting, selecting torrents
'openTorrentFile': () => ipcRenderer.send('openTorrentFile'),
@@ -320,8 +316,8 @@ function escapeBack () {
dispatch('toggleFullScreen')
} else {
dispatch('back')
}
}
}
// Starts all torrents that aren't paused on program startup
function resumeTorrents () {