shithub: zuke

Info  •  Files  •  Log

search: fix cycle when on first/last element in the playlist

--- a/zuke.c

+++ b/zuke.c

@@ -763,7 +763,7 @@

 		return;

 	cycle = 1;

-	for(i = pcur+inc; i >= 0 && i < plnum; i += inc){

+	for(i = pcur+inc; i >= 0 && i < plnum;){

 		m = getmeta(i);

 		for(a = 0; a < m->numartist; a++){

 			if(cistrstr(m->artist[a], buf) != nil)

@@ -775,18 +775,21 @@

 			break;

 		if(cistrstr(m->path, buf) != nil)

 			break;

-		if(cycle && i+inc == -1){

-			cycle = 0;

-			i = plnum;

-		}else if(cycle && i+inc == plnum){

-			cycle = 0;

-			i = -1;

-		}

+onemore:

+		i += inc;

 	}

 	if(i >= 0 && i < plnum){

 		pcur = i;

 		recenter();

 		redraw(1);

+	}else if(cycle && i+inc < 0){

+		cycle = 0;

+		i = plnum;

+		goto onemore;

+	}else if(cycle && i+inc >= plnum){

+		cycle = 0;

+		i = -1;

+		goto onemore;

 	}

 }