yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-04 02:09:37 +02:00
Code Issues Releases Wiki Activity

Merge branch 'release/4.1.0' into develop

Browse source
This commit is contained in:
Chocobozzz 2022-03-08 11:28:32 +01:00
commit 7b51ede977
No known key found for this signature in database
GPG key ID: 583A612D890159BE
15 changed files with 132 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

2
server/middlewares/validators/videos/video-transcoding.ts
View file

@ -37,7 +37,7 @@ const createTranscodingValidator = [
// Prefer using job info table instead of video state because before 4.0 failed transcoded video were stuck in "TO_TRANSCODE" state
const info = await VideoJobInfoModel.load(video.id)
if (info && info.pendingTranscode !== 0) {
if (info && info.pendingTranscode > 0) {
return res.fail({
status: HttpStatusCode.CONFLICT_409,
message: 'This video is already being transcoded'