fix: avoid try render from torrent progress after component did unmount

WatchItDev · Mar 30, 2021 · a2d8bac · a2d8bac
1 parent 13b2d24
commit a2d8bac
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/main/core/torrent.js b/src/main/core/torrent.js
@@ -70,6 +70,7 @@ module.exports = class TorrentStreamer extends EventEmitter {
         let state = 'Connecting';
 
         // There's a minimum size before we start playing the video.
+        if (this.stopped) return; // Avoid keep loading timeout
         const targetLoadedSize = MIN_SIZE_LOADED > total ? total : MIN_SIZE_LOADED;
         const targetLoadedPercent = MIN_PERCENTAGE_LOADED * total / 100.0;
         const targetLoaded = Math.max(targetLoadedPercent, targetLoadedSize);
@@ -171,7 +172,7 @@ module.exports = class TorrentStreamer extends EventEmitter {
                     this.flix.href = 'http://127.0.0.1:' + this.flix.server.address().port + '/';
 
                     //Clear old timeout
-                    this.loadedTimeout ? clearTimeout(this.loadedTimeout) : null;
+                    this.loadedTimeout && clearTimeout(this.loadedTimeout);
                     this.checkLoadingProgress(this.flix);
                 }
             });

diff --git a/src/render/core/app/components/app-movie-player-torrent/index.jsx b/src/render/core/app/components/app-movie-player-torrent/index.jsx
@@ -49,7 +49,7 @@ export default class AppMoviesPlayerTorrent extends React.PureComponent {
             <>
                 {
                     (
-                        !this.state.canPlay && !this.state.flix &&
+                        !this.state.canPlay &&
                         <div className="absolute full-width full-height player-overlay-loader">
                             <AppMoviePlayerLoader
                                 stateText={this.state.state}