From: Andre Noll <maan@systemlinux.org>
Date: Sun, 6 Sep 2009 20:23:58 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v0.4.0~27
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=3ddbf5db98280cb09ef74726573b0b3f3b7e62d6;hp=3852121ecd25d74d4b4c5e7a63771c55a85ce4bc;p=paraslash.git

Merge branch 'master' into next
---

diff --git a/filter.c b/filter.c
index 1ea7ac89..7dbc0785 100644
--- 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 b5047d37..fe8ee8ad 100644
--- 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.