- if(rescan_pid != -1 && kill(rescan_pid, SIGTERM) < 0)
- fatal(errno, "error killing rescanner");
+ if(rescan_pid != -1) {
+ /* shut down the rescanner */
+ if(kill(rescan_pid, SIGTERM) < 0)
+ fatal(errno, "error killing rescanner");
+ /* wait for the rescanner to finish */
+ while(waitpid(rescan_pid, &err, 0) == -1 && errno == EINTR)
+ ;
+ }