Skip to content

M
mpd
Commit 0db46f05 authored by Warren Dukes's avatar Warren Dukes
Browse files
Options

fix bug where db_update wasn't being set in readDirectoryDB

git-svn-id: https://svn.musicpd.org/mpd/trunk@1037 09075e82-0dd4-0310-85a5-a0d7c8717e4f
parent b2af230b
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 6 deletions
src/directory.c
View file @ 0db46f05
...@@ -157,16 +157,10 @@ void directory_sigChldHandler(int pid, int status) { ...@@ -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() { ...@@ -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() { ...@@ -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;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment