Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-11-22 11:12:36 +01:00
Code Issues Projects Releases Wiki Activity

Fix bug regarding "find next/regex" - thx minimeh :)

Browse Source 
Fix #5016
This commit is contained in:
Nikolaj Olsson 2021-05-02 13:05:54 +02:00
parent 9298a54691
commit 76aea4d891
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/ui/Forms/Main.cs
View File

@ -5751,10 +5751,23 @@ namespace Nikse.SubtitleEdit.Forms
}
int textBoxStart = tb.SelectionStart;
if (_findHelper.SelectedPosition - 1 == tb.SelectionStart && tb.SelectionLength > 0 ||
_findHelper.FindText.Equals(tb.SelectedText, StringComparison.OrdinalIgnoreCase))
// Note: The logic in the following "else" clause is not valid for
// regex searches and may result in endlessly looping on the first
// found instance, but simply moving the start index up by 1. It is
// not uncommon for a regex to match string+0, string+1, string+2 ...
if (_findHelper.FindReplaceType.FindType == FindType.RegEx)
{
textBoxStart = tb.SelectionStart + 1;
// Move beyond the first instance, not just 1 character beyond the start
// of the found instance,
textBoxStart += tb.SelectionLength;
}
else
{
if (_findHelper.SelectedPosition - 1 == tb.SelectionStart && tb.SelectionLength > 0 ||
_findHelper.FindText.Equals(tb.SelectedText, StringComparison.OrdinalIgnoreCase))
{
textBoxStart = tb.SelectionStart + 1;
}
}
if (_findHelper.FindNext(_subtitle, _subtitleOriginal, selectedIndex, textBoxStart, Configuration.Settings.General.AllowEditOfOriginalSubtitle))