diff options
| author | Chocobozzz <me@florianbigard.com> | 2020-02-26 15:26:02 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2020-02-26 15:26:02 +0100 |
| commit | 818c449b3c34e9f324ac744120c8774e724ab25e (patch) | |
| tree | ca470149152d49ee3a40b46f779fd01008e7a9c3 /client/src/standalone | |
| parent | 4832e41584044cdc6c4ef9852d458031326b164d (diff) | |
| parent | c002261381a4dd0b07dd6706942d446b237fd8f4 (diff) | |
| download | PeerTube-818c449b3c34e9f324ac744120c8774e724ab25e.tar.gz PeerTube-818c449b3c34e9f324ac744120c8774e724ab25e.tar.zst PeerTube-818c449b3c34e9f324ac744120c8774e724ab25e.zip | |
Merge branch 'release/2.1.0' into develop
Diffstat (limited to 'client/src/standalone')
| -rw-r--r-- | client/src/standalone/videos/embed.ts | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/client/src/standalone/videos/embed.ts b/client/src/standalone/videos/embed.ts index d5b42a025..e3bcbc010 100644 --- a/client/src/standalone/videos/embed.ts +++ b/client/src/standalone/videos/embed.ts | |||
| @@ -263,6 +263,9 @@ export class PeerTubeEmbed { | |||
| 263 | private async buildDock (videoInfo: VideoDetails, configResponse: Response) { | 263 | private async buildDock (videoInfo: VideoDetails, configResponse: Response) { |
| 264 | if (!this.controls) return | 264 | if (!this.controls) return |
| 265 | 265 | ||
| 266 | // On webtorrent fallback, player may have been disposed | ||
| 267 | if (!this.player.player_) return | ||
| 268 | |||
| 266 | const title = this.title ? videoInfo.name : undefined | 269 | const title = this.title ? videoInfo.name : undefined |
| 267 | 270 | ||
| 268 | const config: ServerConfig = await configResponse.json() | 271 | const config: ServerConfig = await configResponse.json() |