From 715af3519b6ad403bef2f608a3a503e5cc3bcf79 Mon Sep 17 00:00:00 2001 From: Justin Maggard Date: Sun, 4 Sep 2011 04:07:36 +0000 Subject: [PATCH] * Fixup last checkin. --- playlist.c | 2 +- scanner.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/playlist.c b/playlist.c index 436290d..3feb694 100644 --- a/playlist.c +++ b/playlist.c @@ -147,7 +147,7 @@ fill_playlists() if( last_dir ) { fname = basename(plist.path); - detailID = sql_get_int_field(db, "SELECT ID from DETAILS where PATH = '%s/%s'", last_dir, fname); + detailID = sql_get_int_field(db, "SELECT ID from DETAILS where PATH = '%q/%q'", last_dir, fname); if( detailID <= 0 ) { sqlite3_free(last_dir); diff --git a/scanner.c b/scanner.c index ab0e01e..5b4581b 100644 --- a/scanner.c +++ b/scanner.c @@ -829,9 +829,13 @@ start_scanner() sql_exec(db, "create INDEX IDX_SEARCH_OPT ON OBJECTS(OBJECT_ID, CLASS, DETAIL_ID);"); if( GETFLAG(NO_PLAYLIST_MASK) ) + { DPRINTF(E_WARN, L_SCANNER, "Playlist creation disabled\n"); + } else + { fill_playlists(); + } DPRINTF(E_DEBUG, L_SCANNER, "Initial file scan completed\n", DB_VERSION); //JM: Set up a db version number, so we know if we need to rebuild due to a new structure.