Restore playback state when reopening player (#877)

webtorrent · Sep 3, 2016 · 11f8e42 · 11f8e42
1 parent 704455c
commit 11f8e42
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/src/renderer/controllers/playback-controller.js b/src/renderer/controllers/playback-controller.js
@@ -34,12 +34,20 @@ module.exports = class PlaybackController {
         else this.play()
       })
     } else {
+      let initialized = false
       state.location.go({
         url: 'player',
         setup: (cb) => {
-          this.play()
+          const torrentSummary = TorrentSummary.getByKey(state, infoHash)
+
+          if (index === undefined || initialized) index = torrentSummary.mostRecentFileIndex
+          if (index === undefined) index = torrentSummary.files.findIndex(TorrentPlayer.isPlayable)
+          if (index === undefined) return cb(new errors.UnplayableError())
+
+          initialized = true
+
           this.openPlayer(infoHash, index, (err) => {
-            if (!err) this.play
+            if (!err) this.play()
             cb(err)
           })
         },
@@ -211,10 +219,6 @@ module.exports = class PlaybackController {
     const state = this.state
     const torrentSummary = TorrentSummary.getByKey(state, infoHash)
 
-    if (index === undefined) index = torrentSummary.mostRecentFileIndex
-    if (index === undefined) index = torrentSummary.files.findIndex(TorrentPlayer.isPlayable)
-    if (index === undefined) return cb(new errors.UnplayableError())
-
     state.playing.infoHash = torrentSummary.infoHash
 
     // update UI to show pending playback