diff --git a/src/db-sql-sqlite2.c b/src/db-sql-sqlite2.c index 28e190bb..4147b9bb 100644 --- a/src/db-sql-sqlite2.c +++ b/src/db-sql-sqlite2.c @@ -461,7 +461,7 @@ char *db_sqlite2_initial1 = " subterm VARCHAR(255) DEFAULT NULL,\n" " value VARCHAR(1024) NOT NULL\n" ");\n" -"insert into config values ('version','','9');\n"; +"insert into config values ('version','10');\n"; char *db_sqlite2_initial2 = "create table playlists (\n" diff --git a/src/db-sql-sqlite3.c b/src/db-sql-sqlite3.c index ce35bac8..968022a8 100644 --- a/src/db-sql-sqlite3.c +++ b/src/db-sql-sqlite3.c @@ -506,7 +506,7 @@ char *db_sqlite3_initial1 = " subterm VARCHAR(255) DEFAULT NULL,\n" " value VARCHAR(1024) NOT NULL\n" ");\n" -"insert into config values ('version','','9');\n"; +"insert into config values ('version','','10');\n"; char *db_sqlite3_initial2 = "create table playlists (\n" diff --git a/src/mp3-scanner.c b/src/mp3-scanner.c index 82502dac..2bf9633b 100644 --- a/src/mp3-scanner.c +++ b/src/mp3-scanner.c @@ -200,6 +200,7 @@ void scan_add_playlistlist(char *path) { void scan_process_playlistlist(void) { PLAYLISTLIST *pnext; char *ext; + char *file; DPRINTF(E_DBG,L_SCAN,"Starting playlist loop\n"); @@ -212,7 +213,12 @@ void scan_process_playlistlist(void) { ext = strrchr(pnext->path,'.'); } - if(strcasecmp(pnext->path,"iTunes Music Library.xml") == 0) { + file=pnext->path; + if(strrchr(pnext->path,PATHSEP)) { + file = strrchr(pnext->path,PATHSEP) + 1; + } + + if(strcasecmp(file,"iTunes Music Library.xml") == 0) { if(conf_get_int("scanning","process_xml",1)) { DPRINTF(E_LOG,L_SCAN,"Scanning %s\n",pnext->path); scan_xml_playlist(pnext->path);