oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

fix bug where db_update wasn't being set in readDirectoryDB

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@1037 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Warren Dukes
2004-05-17 11:56:14 +00:00
parent b2af230b5e
commit 0db46f0592
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/directory.c
View File

@@ -157,16 +157,10 @@ void directory_sigChldHandler(int pid, int status) {
void readDirectoryDBIfUpdateIsFinished() { void readDirectoryDBIfUpdateIsFinished() {
if(directory_reReadDB && 0==directory_updatePid) { if(directory_reReadDB && 0==directory_updatePid) {
struct stat st;
DEBUG("readDirectoryDB since update finished successfully\n"); DEBUG("readDirectoryDB since update finished successfully\n");
readDirectoryDB(); readDirectoryDB();
incrPlaylistVersion(); incrPlaylistVersion();
directory_reReadDB = 0; directory_reReadDB = 0;
if(stat(directory_db,&st)==0) {
directory_dbModTime = st.st_mtime;
}
} }
} }
@@ -896,6 +890,7 @@ int writeDirectoryDB() {
int readDirectoryDB() { int readDirectoryDB() {
FILE * fp; FILE * fp;
struct stat st;
if(!mp3rootDirectory) mp3rootDirectory = newDirectory(NULL); if(!mp3rootDirectory) mp3rootDirectory = newDirectory(NULL);
while(!(fp=fopen(directory_db,"r")) && errno==EINTR); while(!(fp=fopen(directory_db,"r")) && errno==EINTR);
@@ -975,6 +970,8 @@ int readDirectoryDB() {
stats.numberOfSongs = countSongsIn(stderr,NULL); stats.numberOfSongs = countSongsIn(stderr,NULL);
stats.dbPlayTime = sumSongTimesIn(stderr,NULL); stats.dbPlayTime = sumSongTimesIn(stderr,NULL);
if(stat(directory_db,&st)==0) directory_dbModTime = st.st_mtime;
return 0; return 0;
} }