CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-07-02 21:20:28 +12:00
Code Issues Packages Projects Releases Wiki Activity

#1950: When custom personal path is empty, show preview of default portable path properly

Browse source
This commit is contained in:
Jaex 2016-09-30 12:53:16 +03:00
parent 8bdfdccbec
commit 5e79bd7b2a
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ShareX/Forms/ApplicationSettingsForm.cs
View file

@ -294,7 +294,18 @@ private void UpdatePersonalFolderPathPreview()
if (string.IsNullOrEmpty(personalPath))
{
personalPath = Program.DefaultPersonalFolder;
if (Program.PortableApps)
{
personalPath = Program.PortableAppsPersonalFolder;
}
else if (Program.Portable)
{
personalPath = Program.PortablePersonalFolder;
}
else
{
personalPath = Program.DefaultPersonalFolder;
}
}
else
{

4
ShareX/Program.cs
View file

@ -104,8 +104,8 @@ public static string Title
private const string PersonalPathConfigFileName = "PersonalPath.cfg";
public static readonly string DefaultPersonalFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), AppName);
private static readonly string PortablePersonalFolder = Helpers.GetAbsolutePath(AppName);
private static readonly string PortableAppsPersonalFolder = Helpers.GetAbsolutePath("../../Data");
public static readonly string PortablePersonalFolder = Helpers.GetAbsolutePath(AppName);
public static readonly string PortableAppsPersonalFolder = Helpers.GetAbsolutePath("../../Data");
private static string PersonalPathConfigFilePath
{