X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mood.c;h=94deff4684c5a335d38f5b843e22a4cee7dbc880;hp=8d171bde93170dd110ffe4d1b480dc313a8c61de;hb=074b80bb23b8fa610464bd98dc4bc7dd2babc88a;hpb=56d75bd90d78cf44cd3984ce2a45627ef5646d38 diff --git a/mood.c b/mood.c index 8d171bde..94deff46 100644 --- a/mood.c +++ b/mood.c @@ -870,6 +870,9 @@ static int reload_current_mood(void) int ret; char *mood_name = NULL; + ret = clear_score_table(); + if (ret < 0) + return ret; if (!current_mood) return 1; PARA_NOTICE_LOG("reloading %s\n", current_mood->name? @@ -898,8 +901,6 @@ static int reload_current_mood(void) int moods_event_handler(enum afs_events event, __a_unused struct para_buffer *pb, void *data) { - int ret; - if (!current_mood) return 0; switch (event) { @@ -912,10 +913,6 @@ int moods_event_handler(enum afs_events event, __a_unused struct para_buffer *pb case BLOB_ADD: if (data == moods_table || data == playlists_table) return 1; /* no reload necessary for these */ - ret = clear_score_table(); - if (ret < 0) - PARA_CRIT_LOG("clear score table returned %s\n", - para_strerror(-ret)); return reload_current_mood(); /* these also require reload of the score table */ case ATTRIBUTE_ADD: