Commit 1c172e7c authored by Guillaume Lebigot's avatar Guillaume Lebigot

Merged upstream

parents 3a1cb9e5 22bf672d
Pipeline #8657 passed with stage
in 30 seconds
......@@ -2311,6 +2311,9 @@ let SubtitleManager = (function() {
megablock += currblock;
}
// Remove pieces that have no text.
pieces = pieces.filter(piece => piece.replace(/{[^}]*}/g,""));
// Convert piece text into a NewLinePiece.
let pieceNum = 0, newLine = pieces.map(piece => NewLinePiece(this, combineAdjacentBlocks(piece), ++pieceNum));
newLine.shattered = false;
......@@ -2396,7 +2399,7 @@ let SubtitleManager = (function() {
}
}
if(this.group)
if (this.group)
this.group.remove();
this.group = null;
......
......@@ -155,7 +155,8 @@ class Video:
if len(files) == 0:
print("The following folder does not have a video file:")
print(self.folder)
raise SystemExit()
if self.passedQA:
raise SystemExit()
if len(files) == 1:
fileName = files.pop()
self.file = os.path.join(folder, fileName)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment