goto out;
/* ignore subsequent errors (but log them) */
para_printf(&aca->pbout, "could not activate %s\n", arg);
- if (current_mop) {
+ if (current_mop && strcmp(current_mop, arg) != 0) {
int ret2;
para_printf(&aca->pbout, "switching back to %s\n", current_mop);
ret2 = activate_mood_or_playlist(current_mop, &num_admissible);
static void init_admissible_files(const char *arg)
{
- if (activate_mood_or_playlist(arg, NULL) < 0)
+ int ret = activate_mood_or_playlist(arg, NULL);
+ if (ret < 0) {
+ assert(arg);
+ PARA_WARNING_LOG("could not activate %s: %s\n", arg,
+ para_strerror(-ret));
activate_mood_or_playlist(NULL, NULL); /* always successful */
+ }
}
static int setup_command_socket_or_die(void)