This commit is contained in:
John Jenko 2011-05-04 15:58:42 +00:00
parent b0e42d7ce3
commit 4eb9d42c42
2 changed files with 3 additions and 3 deletions

View File

@ -963,7 +963,7 @@ namespace VEPROMS
{ {
toolsPanel.Expanded = true; toolsPanel.Expanded = true;
toolsTabs.SelectedTab = toolsTabBookMarks; toolsTabs.SelectedTab = toolsTabBookMarks;
if (_CurrentItem != null) displayBookMarks.AddBookMark(_CurrentItem); if (_CurrentItem != null && !dlgFindReplace.Visible) displayBookMarks.AddBookMark(_CurrentItem);
} }
else if (args.PanelTabName == "Global Search") else if (args.PanelTabName == "Global Search")
{ {

View File

@ -163,9 +163,9 @@ namespace Volian.Controls.Library
{ {
ItemInfo next = (cbxReverse.Checked) ? MyEditItem.MyItemInfo.SearchPrev : MyEditItem.MyItemInfo.SearchNext; ItemInfo next = (cbxReverse.Checked) ? MyEditItem.MyItemInfo.SearchPrev : MyEditItem.MyItemInfo.SearchNext;
while (!next.IsSection && !next.MyContent.Text.ToUpper().Contains(cmboFindText.Text.ToUpper())) while ((next != null) && !next.IsSection && !next.MyContent.Text.ToUpper().Contains(cmboFindText.Text.ToUpper()))
next = (cbxReverse.Checked) ? next.SearchPrev : next.SearchNext; next = (cbxReverse.Checked) ? next.SearchPrev : next.SearchNext;
if (next.IsSection) if ((next == null) || next.IsSection)
{ {
if (!findingbookmarks) if (!findingbookmarks)
{ {