Merge commit 'remotes/fml/master'

diff --combined grab_client.c
index 13b066b170dd0fb0c87a8bee88a2045a030a3bec,0cd9c3201182feeaa77d03e7f78dae8be85b3c4b..4be23d7807ad7e34f5a8cece9c58f0ae7971b536
--- 1/grab_client.c
--- 2/grab_client.c
+++ b/grab_client.c
@@@ -164,7 -164,7 +164,7 @@@ void activate_grab_client(struct grab_c
   *
   * \param slot_num Audiod's slot for the new audio file.
   * \param audio_format_num The number of the audio format of the new audio file.
 - * \param filter_list The list of activated filters for that new audio file.
 + * \param fc The filter chain containing the activated filters.
   *
   * This is called from audiod.c when the current audio file changes. It loops
   * over all inactive grab clients and checks each grab client's configuration
@@@ -179,7 -179,7 +179,7 @@@ void activate_inactive_grab_clients(in
                struct filter_chain *fc)
  {
        struct grab_client *gc, *tmp;
-       int i;
+       int filter_num;
        struct filter_node *fn;
  
        list_for_each_entry_safe(gc, tmp, &inactive_grab_client_list, node) {
@@@ -189,15 -189,12 +189,12 @@@
                if (gc->audio_format_num >= 0 && gc->audio_format_num !=
                                audio_format_num)
                        continue;
-               if (gc->conf->filter_num_arg >= 0 &&
-                               num_filters(gc->audio_format_num)
-                               < gc->conf->filter_num_arg)
+               filter_num = gc->conf->filter_num_arg;
+               if (filter_num >= 0 && filter_num >= num_filters(gc->audio_format_num))
                        continue;
-               FOR_EACH_FILTER_NODE(fn, fc, i) {
-                       if (gc->conf->filter_num_arg <= 0
-                               || i == gc->conf->filter_num_arg + 1)
-                               break;
-               }
+               if (filter_num < 0)
+                       filter_num = 0;
+               fn = fc->filter_nodes + filter_num;
                activate_grab_client(gc, fn);
        }
  }