diff options
| author | Chocobozzz <me@florianbigard.com> | 2022-03-08 11:28:32 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2022-03-08 11:28:32 +0100 |
| commit | 7b51ede977c299a74728171d8c124bcc4cbba6ea (patch) | |
| tree | ad189d2ed1f987e2053201166af4e953c46529f5 /server/middlewares | |
| parent | ab4b8974997777373a6032073f9c1aaf33ba9931 (diff) | |
| parent | 70f3012acd239be4567d9d9fa0364be75485ad1c (diff) | |
| download | PeerTube-7b51ede977c299a74728171d8c124bcc4cbba6ea.tar.gz PeerTube-7b51ede977c299a74728171d8c124bcc4cbba6ea.tar.zst PeerTube-7b51ede977c299a74728171d8c124bcc4cbba6ea.zip | |
Merge branch 'release/4.1.0' into develop
Diffstat (limited to 'server/middlewares')
| -rw-r--r-- | server/middlewares/validators/videos/video-transcoding.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server/middlewares/validators/videos/video-transcoding.ts b/server/middlewares/validators/videos/video-transcoding.ts index 34f231d45..da6638f4d 100644 --- a/server/middlewares/validators/videos/video-transcoding.ts +++ b/server/middlewares/validators/videos/video-transcoding.ts | |||
| @@ -37,7 +37,7 @@ const createTranscodingValidator = [ | |||
| 37 | 37 | ||
| 38 | // Prefer using job info table instead of video state because before 4.0 failed transcoded video were stuck in "TO_TRANSCODE" state | 38 | // Prefer using job info table instead of video state because before 4.0 failed transcoded video were stuck in "TO_TRANSCODE" state |
| 39 | const info = await VideoJobInfoModel.load(video.id) | 39 | const info = await VideoJobInfoModel.load(video.id) |
| 40 | if (info && info.pendingTranscode !== 0) { | 40 | if (info && info.pendingTranscode > 0) { |
| 41 | return res.fail({ | 41 | return res.fail({ |
| 42 | status: HttpStatusCode.CONFLICT_409, | 42 | status: HttpStatusCode.CONFLICT_409, |
| 43 | message: 'This video is already being transcoded' | 43 | message: 'This video is already being transcoded' |