Skip to content

Check whether upcoming autoplay entry is a file #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deltabeard merged 1 commit into from
Oct 10, 2025
Merged

Check whether upcoming autoplay entry is a file #83

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions source/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ static int cmpstringp(const void *p1, const void *p2)
}

/**
* Store the list of files and folders in current director to an array.
* Store the list of files and folders in current directory to an array.
*/
static int getDir(struct dirList_t* dirList)
{
Expand Down Expand Up @@ -589,7 +589,8 @@ int main(int argc, char **argv)
keyRComboPressed = false;
}
bool goToNextFile = (kDown & KEY_ZR) || keyRActivation;
if (goToNextFile && fileNum < fileMax) {
// check that next entry is a file
if (goToNextFile && fileNum < fileMax && dirList.dirNum < fileNum+1) {
fileNum += 1;
if(fileNum >= MAX_LIST && fileMax - fileNum >= 0 &&
from < fileMax - MAX_LIST)
Expand All @@ -613,8 +614,8 @@ int main(int argc, char **argv)
keyLComboPressed = false;
}
bool goToPrevFile = (kDown & KEY_ZL) || keyLActivation;
// don't go to ../
if (goToPrevFile && fileNum > 1) {
// don't go to ../ and check that previous entry is a file
if (goToPrevFile && fileNum > 1 && dirList.dirNum < fileNum-1) {
fileNum -= 1;
if(fileMax - fileNum > MAX_LIST-2 && from != 0)
from--;
Expand All @@ -631,7 +632,8 @@ int main(int argc, char **argv)

// play next song automatically
if (error == -1) {
if (fileNum >= fileMax) {
// don't try to play folders
if (fileNum >= fileMax || dirList.dirNum >= fileNum) {
error = 0;
continue;
}
Expand Down