list_window: fixed endless loop in non-wrapped search

When the cursor was at the end of a list and the user pressed 'n',
ncmpc would hang in an endless loop forever.  The same bug was fixed
in the backwards search.

diff --git a/src/list_window.c b/src/list_window.c
index 9f34f539fc6d212dfcfdff9643611128bab8238a..46858ee2bb5d2862b9a16dee7fd257a536c2ec7a 100644 (file)
--- a/src/list_window.c
+++ b/src/list_window.c
@@ -221,7 +221,7 @@ list_window_find(struct list_window *lw,
        unsigned i = lw->selected + 1;
        const char *label;
 
-       while (wrap || i == lw->selected + 1) {
+       do {
                while ((label = callback(i,&h,callback_data))) {
                        if (str && label && strcasestr(label, str)) {
                                lw->selected = i;
@@ -237,7 +237,7 @@ list_window_find(struct list_window *lw,
                        i=0; /* first item */
                        screen_bell();
                }
-       }
+       } while (wrap);
 
        return 1;
 }
@@ -257,7 +257,7 @@ list_window_rfind(struct list_window *lw,
        if (rows == 0)
                return 1;
 
-       while (wrap || i == (int)lw->selected - 1) {
+       do {
                while (i >= 0 && (label = callback(i,&h,callback_data))) {
                        if( str && label && strcasestr(label, str) ) {
                                lw->selected = i;
@@ -271,7 +271,8 @@ list_window_rfind(struct list_window *lw,
                        i = rows - 1; /* last item */
                        screen_bell();
                }
-       }
+       } while (wrap);
+
        return 1;
 }