diff options
author | Chocobozzz <me@florianbigard.com> | 2018-04-05 16:22:08 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-04-05 16:22:08 +0200 |
commit | 877b0528f80f129cdd00480bd5660b9f3caa8df4 (patch) | |
tree | 2056742ba22c16ea16bea2efd5cb8f942f519b1b /client/src/assets/player | |
parent | a8462c8e3a61f4f7314fe18c0c10cc2946c254d1 (diff) | |
download | PeerTube-877b0528f80f129cdd00480bd5660b9f3caa8df4.tar.gz PeerTube-877b0528f80f129cdd00480bd5660b9f3caa8df4.tar.zst PeerTube-877b0528f80f129cdd00480bd5660b9f3caa8df4.zip |
Fix auto quality with http fallback
Diffstat (limited to 'client/src/assets/player')
-rw-r--r-- | client/src/assets/player/peertube-videojs-plugin.ts | 3 | ||||
-rw-r--r-- | client/src/assets/player/webtorrent-info-button.ts | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/client/src/assets/player/peertube-videojs-plugin.ts b/client/src/assets/player/peertube-videojs-plugin.ts index 91a3993a3..84a5e7f13 100644 --- a/client/src/assets/player/peertube-videojs-plugin.ts +++ b/client/src/assets/player/peertube-videojs-plugin.ts | |||
@@ -313,7 +313,8 @@ class PeerTubePlugin extends Plugin { | |||
313 | 313 | ||
314 | private runAutoQualityScheduler () { | 314 | private runAutoQualityScheduler () { |
315 | this.autoQualityInterval = setInterval(() => { | 315 | this.autoQualityInterval = setInterval(() => { |
316 | if (this.torrent === undefined) return | 316 | // Not initialized or in HTTP fallback |
317 | if (this.torrent === undefined || this.torrent === null) return | ||
317 | if (this.isAutoResolutionOn() === false) return | 318 | if (this.isAutoResolutionOn() === false) return |
318 | if (this.isAutoResolutionObservation === true) return | 319 | if (this.isAutoResolutionObservation === true) return |
319 | 320 | ||
diff --git a/client/src/assets/player/webtorrent-info-button.ts b/client/src/assets/player/webtorrent-info-button.ts index 8a79e0e50..baeb22b64 100644 --- a/client/src/assets/player/webtorrent-info-button.ts +++ b/client/src/assets/player/webtorrent-info-button.ts | |||
@@ -62,7 +62,7 @@ class WebtorrentInfoButton extends Button { | |||
62 | }) | 62 | }) |
63 | const subDivFallbackText = videojsUntyped.dom.createEl('span', { | 63 | const subDivFallbackText = videojsUntyped.dom.createEl('span', { |
64 | className: 'peers-text', | 64 | className: 'peers-text', |
65 | textContent: 'fallback' | 65 | textContent: ' fallback' |
66 | }) | 66 | }) |
67 | 67 | ||
68 | subDivHttp.appendChild(subDivHttpText) | 68 | subDivHttp.appendChild(subDivHttpText) |