From 6895e91e7c12cc845504f3b897f7a630feee8402 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Mon, 17 Oct 2011 17:52:22 +0000 Subject: [PATCH] Fix validation for Make Lines Continuous Originally committed to SVN as r5741. --- aegisub/src/command/time.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/aegisub/src/command/time.cpp b/aegisub/src/command/time.cpp index 3ce345eff..1e514782f 100644 --- a/aegisub/src/command/time.cpp +++ b/aegisub/src/command/time.cpp @@ -71,16 +71,18 @@ namespace { SelectionController::Selection sel = c->selectionController->GetSelectedSet(); if (sel.size() < 2) return false; - bool found = false; + size_t found = 0; for (entryIter it = c->ass->Line.begin(); it != c->ass->Line.end(); ++it) { AssDialogue *diag = dynamic_cast(*it); if (!diag) continue; + if (sel.count(diag)) { - found = true; + ++found; + if (found == sel.size()) + return true; } - else if (found) { + else if (found) return false; - } } return true; }