fixed several crashes
This commit is contained in:
@@ -167,6 +167,19 @@ void DirectoryNode::advanceToFirstMP3InThisNode()
|
||||
|
||||
DirectoryNode *DirectoryNode::advanceToMP3(const uint16_t id)
|
||||
{
|
||||
|
||||
|
||||
for (size_t i = 0; i < ids.size(); i++)
|
||||
{
|
||||
if (id == ids[i])
|
||||
{
|
||||
// Found the current MP3 file
|
||||
currentPlaying = &mp3Files[i];
|
||||
currentPlayingId = id;
|
||||
return this;
|
||||
}
|
||||
}
|
||||
|
||||
for (auto subdir : subdirectories)
|
||||
{
|
||||
if (subdir->getId() == id)
|
||||
@@ -181,12 +194,9 @@ DirectoryNode *DirectoryNode::advanceToMP3(const uint16_t id)
|
||||
if (id == subdir->ids[i])
|
||||
{
|
||||
// Found the current MP3 file
|
||||
if (i < subdir->mp3Files.size() - 1)
|
||||
{
|
||||
subdir->currentPlaying = &subdir->mp3Files[i];
|
||||
subdir->currentPlayingId = id;
|
||||
return subdir;
|
||||
}
|
||||
subdir->currentPlaying = &subdir->mp3Files[i];
|
||||
subdir->currentPlayingId = id;
|
||||
return subdir;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user