Merge branch 'main' into 12390_DisableDragAndDropWhenAdmin

QuaintMako · Aug 6, 2023 · c5123be · c5123be
2 parents 825cdf9 + 65b2519
commit c5123be
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/Files.App/Actions/Content/Run/RunAsAdminAction.cs b/src/Files.App/Actions/Content/Run/RunAsAdminAction.cs
@@ -1,8 +1,6 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.Utils.Shell;
-
 namespace Files.App.Actions
 {
 	internal class RunAsAdminAction : ObservableObject, IAction
@@ -20,7 +18,9 @@ public RichGlyph Glyph
 
 		public bool IsExecutable =>
 			context.SelectedItem is not null &&
-			FileExtensionHelpers.IsExecutableFile(context.SelectedItem.FileExtension);
+			(FileExtensionHelpers.IsExecutableFile(context.SelectedItem.FileExtension) ||
+			(context.SelectedItem is ShortcutItem shortcut &&
+			shortcut.IsExecutable));
 
 		public RunAsAdminAction()
 		{

diff --git a/src/Files.App/Actions/Content/Run/RunAsAnotherUserAction.cs b/src/Files.App/Actions/Content/Run/RunAsAnotherUserAction.cs
@@ -1,8 +1,6 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.Utils.Shell;
-
 namespace Files.App.Actions
 {
 	internal class RunAsAnotherUserAction : ObservableObject, IAction
@@ -11,7 +9,9 @@ internal class RunAsAnotherUserAction : ObservableObject, IAction
 
 		public bool IsExecutable =>
 			context.SelectedItem is not null &&
-			FileExtensionHelpers.IsExecutableFile(context.SelectedItem.FileExtension);
+			(FileExtensionHelpers.IsExecutableFile(context.SelectedItem.FileExtension) ||
+			(context.SelectedItem is ShortcutItem shortcut &&
+			shortcut.IsExecutable));
 
 		public string Label
 			=> "BaseLayoutContextFlyoutRunAsAnotherUser/Text".GetLocalizedResource();