mirror of https://github.com/MidnightCommander/mc
Ticket #3543: mcview: "Not found" result isn't reported in some cases.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
parent
1cf18abd62
commit
d3a2ca3e12
|
@ -350,7 +350,7 @@ mcview_do_search (WView * view, off_t want_search_start)
|
|||
|
||||
status_msg_deinit (STATUS_MSG (&vsm));
|
||||
|
||||
if (view->search_start != 0 && !isFound && need_search_again
|
||||
if (orig_search_start != 0 && !isFound && need_search_again
|
||||
&& !mcview_search_options.backwards)
|
||||
{
|
||||
int result;
|
||||
|
@ -365,17 +365,13 @@ mcview_do_search (WView * view, off_t want_search_start)
|
|||
if (result != 0)
|
||||
isFound = TRUE;
|
||||
else
|
||||
search_start = 0;
|
||||
}
|
||||
|
||||
if (!isFound && view->search->error_str != NULL)
|
||||
{
|
||||
/* continue search from beginning */
|
||||
off_t search_end;
|
||||
|
||||
search_start = 0;
|
||||
search_end = orig_search_start;
|
||||
/* search_start is 0 here */
|
||||
view->update_activate = search_start;
|
||||
view->update_activate = 0;
|
||||
|
||||
vsm.first = TRUE;
|
||||
vsm.view = view;
|
||||
|
@ -392,6 +388,7 @@ mcview_do_search (WView * view, off_t want_search_start)
|
|||
|
||||
status_msg_deinit (STATUS_MSG (&vsm));
|
||||
}
|
||||
}
|
||||
|
||||
if (!isFound && view->search->error_str != NULL)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue