Merge branch 'master' into next

diff --git a/filter.c b/filter.c
index 1ea7ac89f259b83fe5da9b0246e7b4215b61cf72..7dbc07851b00c78de96b4889663286f468611398 100644 (file)
--- a/filter.c
+++ b/filter.c
@@ -187,8 +187,8 @@ int main(int argc, char *argv[])
        sot->input_error = &fc->task.error;
 
        register_task(&sit->task);
-       register_task(&fc->task);
        register_task(&sot->task);
+       register_task(&fc->task);
        s.default_timeout.tv_sec = 1;
        s.default_timeout.tv_usec = 0;
        ret = schedule(&s);

diff --git a/mood.c b/mood.c
index b5047d3745056703b8afab1ac85e81777cadaca7..fe8ee8ad9915cdc3db089a8f8584883537963111 100644 (file)
--- a/mood.c
+++ b/mood.c
@@ -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.