[vlc-commits] [Git][videolan/vlc][master] cmdline: advanced options should take precedence

[François Cartegnie (@fcartegnie)]

François Cartegnie pushed to branch master at VideoLAN / VLC


Commits:
1d312f1d by Francois Cartegnie at 2022-12-20T14:22:45+00:00
cmdline: advanced options should take precedence

- - - - -


1 changed file:

- src/config/help.c


Changes:

=====================================
src/config/help.c
=====================================
@@ -95,13 +95,6 @@ bool config_PrintHelp (libvlc_int_t *obj)
 {
     char *str;
 
-    /* Check for short help option */
-    if (var_InheritBool (obj, "help"))
-    {
-        Help (obj, "help");
-        return true;
-    }
-
     /* Check for version option */
     if (var_InheritBool (obj, "version"))
     {
@@ -133,11 +126,10 @@ bool config_PrintHelp (libvlc_int_t *obj)
         Help (obj, "longhelp");
         return true;
     }
-
-    /* Check for module list option */
-    if (var_InheritBool (obj, "list"))
+    /* Check for short help option */
+    if (var_InheritBool (obj, "help"))
     {
-        ListModules (obj, false );
+        Help (obj, "help");
         return true;
     }
 
@@ -147,6 +139,13 @@ bool config_PrintHelp (libvlc_int_t *obj)
         return true;
     }
 
+    /* Check for module list option */
+    if (var_InheritBool (obj, "list"))
+    {
+        ListModules (obj, false );
+        return true;
+    }
+
     return false;
 }
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/1d312f1dd7d5199a934d715a919f704edd44aa20

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/1d312f1dd7d5199a934d715a919f704edd44aa20
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance