Merge branch 'master' into next

[paraslash.git] / mood.c

diff --git a/mood.c b/mood.c
index f3ce9e0aa11a691202397039ecd275c1fd05268a..fe8ee8ad9915cdc3db089a8f8584883537963111 100644 (file)
--- a/mood.c
+++ b/mood.c
@@ -35,7 +35,7 @@ struct afs_statistics {
        /** Number of admissible files */
        unsigned num;
 };
-struct afs_statistics statistics;
+static struct afs_statistics statistics;
 
 /**
  * Each line of the current mood corresponds to a mood_item.
@@ -893,7 +893,9 @@ int reload_current_mood(void)
 int moods_event_handler(enum afs_events event, __a_unused struct para_buffer *pb,
                void *data)
 {
-       switch(event) {
+       if (!current_mood)
+               return 0;
+       switch (event) {
        /*
         * The three blob events might change the set of admissible files,
         * so we must reload the score list.