(GH-893) Fix: Help Warns Required Elevated Rights

When running help menus, it should not warn about the need for elevated rights.
chocolatey · Sep 13, 2016 · 43d6581 · 43d6581
1 parent ff7269e
commit 43d6581
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/chocolatey/infrastructure.app/runners/GenericRunner.cs b/src/chocolatey/infrastructure.app/runners/GenericRunner.cs
@@ -58,14 +58,14 @@ private ICommand find_command(ChocolateyConfiguration config, Container containe
             }
             else
             {
-                if (command.may_require_admin_access())
+                if (parseArgs != null)
                 {
-                    warn_when_admin_needs_elevation(config);
+                    parseArgs.Invoke(command);
                 }
 
-                if (parseArgs != null)
+                if (command.may_require_admin_access())
                 {
-                    parseArgs.Invoke(command);
+                    warn_when_admin_needs_elevation(config);
                 }
 
                 set_source_type(config);
@@ -231,6 +231,8 @@ public int count(ChocolateyConfiguration config, Container container, bool isCon
 
         public void warn_when_admin_needs_elevation(ChocolateyConfiguration config)
         {
+            if (config.HelpRequested) return;
+
             var shouldWarn = (!config.Information.IsProcessElevated && config.Information.IsUserAdministrator)
                           || (!config.Information.IsUserAdministrator && ApplicationParameters.InstallLocation.is_equal_to(ApplicationParameters.CommonAppDataChocolatey));