GitList

Browse code

Merge commit '47e3e1097e09da7f973908e09df15e3bb7c5e1f4'

* commit '47e3e1097e09da7f973908e09df15e3bb7c5e1f4':
cmdutils: Use the correct guard

Conflicts:
cmdutils.c

See: 35daf3ca8173f80f200860e06a410ced31a8b360
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Michael Niedermayer authored on 2014/10/17 21:57:00
Showing 1 changed files

cmdutils.c index 8bcc7ac..7353dd5 100644

cmdutils.c

History View file @ 1eda312

@@ -444,7 +444,7 @@ int locate_option(int argc, char **argv, const OptionDef *options,
                                   (po->name && !strcmp(optname, po->name)))
                                  return i;
                     -        if (po->flags & HAS_ARG)
                     +        if (!po->name || po->flags & HAS_ARG)
                                  i++;
+                         }
                          return 0;