MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-11-10 14:09:51 -05:00
Code Issues Packages Projects Releases Wiki Activity

[db] Fix error where adding Spotify track to queue returns "0 tracks added"

Browse Source 
Caused by queue_item_add returning >0 as success, but caller is expecting ==0.
Try to avoid other occurancess of this issue by generally checking for error
("ret < 0") instead.
This commit is contained in:
ejurgensen
2021-05-24 21:55:09 +02:00
parent a597737cad
commit 684c23a044
3 changed files with 66 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/library/filescanner.c
View File

@@ -1741,35 +1741,37 @@ filescanner_fullrescan()
static int
queue_item_stream_add(const char *path, int position, char reshuffle, uint32_t item_id, int *count, int *new_item_id)
{
struct media_file_info mfi;
struct media_file_info mfi = { 0 };
struct db_queue_item qi;
struct db_queue_add_info queue_add_info;
int ret;
memset(&mfi, 0, sizeof(struct media_file_info));
scan_metadata_stream(&mfi, path);
db_queue_item_from_mfi(&qi, &mfi);
ret = db_queue_add_start(&queue_add_info, position);
if (ret == 0)
{
ret = db_queue_add_next(&queue_add_info, &qi);
ret = db_queue_add_end(&queue_add_info, reshuffle, item_id, ret);
if (ret == 0)
{
if (count)
*count = queue_add_info.count;
if (new_item_id)
*new_item_id = queue_add_info.new_item_id;
}
}
if (ret < 0)
goto error;
ret = db_queue_add_next(&queue_add_info, &qi);
ret = db_queue_add_end(&queue_add_info, reshuffle, item_id, ret);
if (ret < 0)
goto error;
if (count)
*count = queue_add_info.count;
if (new_item_id)
*new_item_id = queue_add_info.new_item_id;
free_queue_item(&qi, 1);
free_mfi(&mfi, 1);
return 0;
error:
free_queue_item(&qi, 1);
free_mfi(&mfi, 1);
return -1;
}
static int