Skip to content

Fix: Fixed issue with environment variables not working for shortcuts #11130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 1, 2023
Merged

Fix: Fixed issue with environment variables not working for shortcuts #11130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6cc809a
Fix environment variables not working in shortcut item target path
hecksmosis Feb 1, 2023
2faa412
Merge branch 'main' into shortcut_env_vars
hecksmosis Feb 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Files.App/Helpers/UIFilesystemHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ public static async Task CreateShortcutFromDialogAsync(IShellPage associatedInst
/// <param name="runAsAdmin"></param>
public static void UpdateShortcutItemProperties(ShortcutItem item, string targetPath, string arguments, string workingDir, bool runAsAdmin)
{
item.TargetPath = targetPath;
item.TargetPath = Environment.ExpandEnvironmentVariables(targetPath);
item.Arguments = arguments;
item.WorkingDirectory = workingDir;
item.RunAsAdmin = runAsAdmin;
Expand Down
2 changes: 1 addition & 1 deletion src/Files.App/ViewModels/Properties/FolderProperties.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public override void GetBaseProperties()
ViewModel.ShortcutItemOpenLinkCommand = new RelayCommand(async () =>
{
await App.Window.DispatcherQueue.EnqueueAsync(
() => NavigationHelpers.OpenPathInNewTab(Path.GetDirectoryName(ViewModel.ShortcutItemPath)));
() => NavigationHelpers.OpenPathInNewTab(Path.GetDirectoryName(Environment.ExpandEnvironmentVariables(ViewModel.ShortcutItemPath))));
}, () =>
{
return !string.IsNullOrWhiteSpace(ViewModel.ShortcutItemPath);
Expand Down