From 73ee949d553c6a09221643e7d9a34a7b217cb06c Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Mon, 5 Dec 2011 03:22:33 +0000 Subject: [PATCH] Fix bounds checking in the rectangular clip visual tool with detached video Originally committed to SVN as r5960. --- aegisub/src/visual_tool_clip.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/aegisub/src/visual_tool_clip.cpp b/aegisub/src/visual_tool_clip.cpp index 9661729ee..f534aa22d 100644 --- a/aegisub/src/visual_tool_clip.cpp +++ b/aegisub/src/visual_tool_clip.cpp @@ -105,9 +105,8 @@ bool VisualToolClip::InitializeHold() { void VisualToolClip::UpdateHold() { // Limit to video area - Vector2D zero(0, 0); - cur_1 = zero.Max(video_res.Min(drag_start)); - cur_2 = zero.Max(video_res.Min(mouse_pos)); + cur_1 = video_pos.Max((video_pos + video_res).Min(drag_start)); + cur_2 = video_pos.Max((video_pos + video_res).Min(mouse_pos)); SetFeaturePositions(); CommitHold();