don't count directories when counting children of opened dir

ravachol · Nov 20, 2024 · 88ff0a1 · 88ff0a1
1 parent d485166
commit 88ff0a1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/player.c b/src/player.c
@@ -1114,8 +1114,9 @@ int displayTree(FileSystemEntry *root, int depth, int maxListSize, int maxNameWi
 
                                 while (tmpc != NULL)
                                 {
-                                        tmpc = tmpc->next;
-                                        libCurrentDirSongCount++;
+                                        if (!tmpc->isDirectory)
+                                                libCurrentDirSongCount++;
+                                        tmpc = tmpc->next;                                        
                                 }
 
                                 lastEntry = currentEntry;
@@ -1291,6 +1292,7 @@ void showLibrary(SongData *songData, AppState *state)
                                 chosenLibRow -= state->uiState.numSongsAboveSubDir;
                                 state->uiState.openedSubDir = false;
                                 state->uiState.numSongsAboveSubDir = 0;
+                                previouslyAllowedChooseSongs = false;
                         }
                 }
                 else

diff --git a/src/playerops.c b/src/playerops.c
@@ -959,10 +959,10 @@ void enqueueSongs(FileSystemEntry *entry, UIState *uis)
 
                                 while (tmpc != NULL)
                                 {
+                                        if (strcmp(entry->fullPath, tmpc->fullPath) == 0)
+                                                break;                                         
                                         tmpc = tmpc->next;                                        
-                                        uis->numSongsAboveSubDir++;                                        
-                                        if (tmpc != NULL && strcmp(entry->fullPath, tmpc->fullPath) == 0)
-                                                break;                                                                              
+                                        uis->numSongsAboveSubDir++;                                                                                                                     
                                 }
                         }
                         setCurrentAsChosenDir();