X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mood.c;h=8e6a7665f15e32bc5774c5539358ccaf0bcbc880;hp=e5e8495369f1e7ffffe36bd463ec5aadf6163e39;hb=1565acea5e9fe7413831c3a49032f35f721de608;hpb=70f1568da2eeefdc0b01c3e9806da348b350a6b1 diff --git a/mood.c b/mood.c index e5e84953..8e6a7665 100644 --- a/mood.c +++ b/mood.c @@ -896,6 +896,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? @@ -924,8 +927,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) { @@ -938,10 +939,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: