Merge topic branch t/afs-ls-a into master

[paraslash.git] / mood.c

diff --git a/mood.c b/mood.c
index 94ec3cd49ee3128348185d829acaa417fdbb5b5c..b4d50c88e73533c69e7473c072e3aaef1c196d99 100644 (file)
--- a/mood.c
+++ b/mood.c
@@ -134,6 +134,8 @@ static void destroy_mood(struct mood_instance *m)
        if (!m)
                return;
        mp_shutdown(m->parser_context);
+       if (m->score_table)
+               score_close(m->score_table);
        free(m->name);
        free(m);
 }
@@ -661,13 +663,11 @@ int mood_load(const char *mood_name, struct mood_instance **result, char **msg)
                mood_unload(NULL);
                current_mood = aa.m;
        }
+       ret = 1;
 out:
        free(aa.array);
-       if (ret < 0) {
-               if (aa.m->score_table)
-                       score_close(aa.m->score_table);
+       if (ret <= 0) /* error, or no admissible files */
                destroy_mood(aa.m);
-       }
        return ret;
 }