From 42316531462f9f287d0a74a0ccb9ce06fb696c3f Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Tue, 1 May 2012 02:49:53 +0000
Subject: [PATCH] When joining lines, use the maximum of the lines' end times
 rather than the last line's end time

Originally committed to SVN as r6734.
---
 aegisub/src/command/edit.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aegisub/src/command/edit.cpp b/aegisub/src/command/edit.cpp
index 0ed360792..bce900c32 100644
--- a/aegisub/src/command/edit.cpp
+++ b/aegisub/src/command/edit.cpp
@@ -242,7 +242,7 @@ static void combine_lines(agi::Context *c, void (*combiner)(AssDialogue *, AssDi
 
 		combiner(first, diag);
 
-		first->End = diag->End;
+		first->End = std::max(first->End, diag->End);
 		delete diag;
 	}