iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed issue #673, related to concatenation of null-timed lines. 

Originally committed to SVN as r1924.
This commit is contained in:
Rodrigo Braz Monteiro 2008-03-06 19:57:14 +00:00
parent 9cd698f673
commit d447236571
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
aegisub/subs_grid.cpp
View File

@ -1052,6 +1052,7 @@ void SubtitlesGrid::JoinLines(int n1,int n2,bool concat) {
AssDialogue *cur;
int start,end;
bool gotfirst = false;
bool gottime = false;
for (int i=n1;i<=n2;i++) {
// Get start and end time of current line
cur = GetDialogue(i);
@ -1062,6 +1063,7 @@ void SubtitlesGrid::JoinLines(int n1,int n2,bool concat) {
if (start != 0 || end != 0) {
if (start < min_ms) min_ms = start;
if (end > max_ms) max_ms = end;
gottime = true;
}
// Set text
@ -1072,6 +1074,12 @@ void SubtitlesGrid::JoinLines(int n1,int n2,bool concat) {
}
}
// If it didn't get any times, then it's probably because they were all 0 lines.
if (!gottime) {
min_ms = 0;
max_ms = 0;
}
// Apply settings to first line
cur = GetDialogue(n1);
cur->Start.SetMS(min_ms);