CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-10-01 17:56:51 +13:00
Code Issues Projects Releases Packages Wiki Activity

Environment variable support for personal folder and custom screenshots folder

Browse source
This commit is contained in:
Jaex 2015-02-18 12:58:14 +02:00
parent 0a24a43f0b
commit 8c4d45f08a
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ShareX/Forms/ApplicationSettingsForm.cs
View file

@ -230,7 +230,8 @@ private void UpdatePersonalFolderPathPreview()
}
else
{
personalPath = Path.GetFullPath(personalPath);
personalPath = Environment.ExpandEnvironmentVariables(personalPath);
personalPath = Helpers.GetAbsolutePath(personalPath);
}
lblPreviewPersonalFolderPath.Text = personalPath;

3
ShareX/Program.cs
View file

@ -205,7 +205,7 @@ public static string ScreenshotsParentFolder
{
if (Settings != null && Settings.UseCustomScreenshotsPath && !string.IsNullOrEmpty(Settings.CustomScreenshotsPath))
{
return Settings.CustomScreenshotsPath;
return Environment.ExpandEnvironmentVariables(Settings.CustomScreenshotsPath);
}
return Path.Combine(PersonalPath, "Screenshots");
@ -445,6 +445,7 @@ private static void CheckPersonalPathConfig()
if (!string.IsNullOrEmpty(customPersonalPath))
{
customPersonalPath = Environment.ExpandEnvironmentVariables(customPersonalPath);
CustomPersonalPath = Helpers.GetAbsolutePath(customPersonalPath);
if (CustomPersonalPath.Equals(PortablePersonalPath, StringComparison.InvariantCultureIgnoreCase))