From 5e79bd7b2a914268af33728461981e0975e72a95 Mon Sep 17 00:00:00 2001
From: Jaex <Jaex@users.noreply.github.com>
Date: Fri, 30 Sep 2016 12:53:16 +0300
Subject: [PATCH] #1950: When custom personal path is empty, show preview of
 default portable path properly

---
 ShareX/Forms/ApplicationSettingsForm.cs | 13 ++++++++++++-
 ShareX/Program.cs                       |  4 ++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/ShareX/Forms/ApplicationSettingsForm.cs b/ShareX/Forms/ApplicationSettingsForm.cs
index 01bff5810..bfc1ddea3 100644
--- a/ShareX/Forms/ApplicationSettingsForm.cs
+++ b/ShareX/Forms/ApplicationSettingsForm.cs
@@ -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
             {
diff --git a/ShareX/Program.cs b/ShareX/Program.cs
index 23a54219a..ffe9a5eb7 100644
--- a/ShareX/Program.cs
+++ b/ShareX/Program.cs
@@ -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
         {