From 3b8ea5379d9997c4b9901972728fa34f73d3e6ea Mon Sep 17 00:00:00 2001
From: Jaex <Jaex@users.noreply.github.com>
Date: Sun, 10 Aug 2014 01:59:26 +0300
Subject: [PATCH] fixed #161: Picture box error issue fixed #233: FTP name
 parsing consistency

---
 HelpersLib/Controls/MyPictureBox.cs          |  17 +++++++++---
 HelpersLib/HelpersLib.csproj                 |   3 +++
 HelpersLib/Properties/Resources.Designer.cs  |  10 +++++++
 HelpersLib/Properties/Resources.resx         |   9 ++++---
 HelpersLib/Resources/cross.png               | Bin 0 -> 2168 bytes
 ShareX/VideoEncodersForm.cs                  |  27 ++++++++++++++++++-
 UploadersLib/FileUploaders/FTP.cs            |   5 ++--
 UploadersLib/FileUploaders/FTP/FTPAccount.cs |   8 ++++--
 UploadersLib/FileUploaders/SFTP.cs           |   5 ++--
 9 files changed, 71 insertions(+), 13 deletions(-)
 create mode 100644 HelpersLib/Resources/cross.png

diff --git a/HelpersLib/Controls/MyPictureBox.cs b/HelpersLib/Controls/MyPictureBox.cs
index a8a979e5d..bc19900dc 100644
--- a/HelpersLib/Controls/MyPictureBox.cs
+++ b/HelpersLib/Controls/MyPictureBox.cs
@@ -144,6 +144,7 @@ public MyPictureBox()
             InitializeComponent();
             Text = string.Empty;
             pbMain.InitialImage = Resources.Loading;
+            pbMain.ErrorImage = Resources.cross;
             pbMain.LoadProgressChanged += pbMain_LoadProgressChanged;
             pbMain.LoadCompleted += pbMain_LoadCompleted;
             pbMain.Resize += pbMain_Resize;
@@ -237,13 +238,23 @@ private void LoadImageAsync(string path)
 
         public void Reset()
         {
-            if (!isImageLoading)
+            if (!isImageLoading && Image != null)
             {
-                if (Image != null)
+                Image temp = null;
+
+                try
                 {
-                    Image.Dispose();
+                    temp = Image;
                     Image = null;
                 }
+                finally
+                {
+                    // If error happened in previous image load then PictureBox set image as error image and if we dispose it then error happens.
+                    if (temp != null && temp != pbMain.ErrorImage)
+                    {
+                        temp.Dispose();
+                    }
+                }
             }
 
             if (FullscreenOnClick && Cursor != Cursors.Default)
diff --git a/HelpersLib/HelpersLib.csproj b/HelpersLib/HelpersLib.csproj
index 89e4d7ad4..be3136106 100644
--- a/HelpersLib/HelpersLib.csproj
+++ b/HelpersLib/HelpersLib.csproj
@@ -430,6 +430,9 @@
   <ItemGroup>
     <None Include="Resources\ShareX_Logo.png" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\cross.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/HelpersLib/Properties/Resources.Designer.cs b/HelpersLib/Properties/Resources.Designer.cs
index cc210c9a5..5c29668a7 100644
--- a/HelpersLib/Properties/Resources.Designer.cs
+++ b/HelpersLib/Properties/Resources.Designer.cs
@@ -60,6 +60,16 @@ internal class Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap cross {
+            get {
+                object obj = ResourceManager.GetObject("cross", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Byte[].
         /// </summary>
diff --git a/HelpersLib/Properties/Resources.resx b/HelpersLib/Properties/Resources.resx
index d47167b75..09036668e 100644
--- a/HelpersLib/Properties/Resources.resx
+++ b/HelpersLib/Properties/Resources.resx
@@ -112,12 +112,12 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="Loading" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Loading.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -133,4 +133,7 @@
   <data name="ShareX_Logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\ShareX_Logo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="cross" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\cross.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/HelpersLib/Resources/cross.png b/HelpersLib/Resources/cross.png
new file mode 100644
index 0000000000000000000000000000000000000000..34916d87f75d4e103873c960bb61d8a5a2a1c472
GIT binary patch
literal 2168
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

literal 0
HcmV?d00001

diff --git a/ShareX/VideoEncodersForm.cs b/ShareX/VideoEncodersForm.cs
index 360570631..825422218 100644
--- a/ShareX/VideoEncodersForm.cs
+++ b/ShareX/VideoEncodersForm.cs
@@ -1,4 +1,29 @@
-using HelpersLib;
+#region License Information (GPL v3)
+
+/*
+    ShareX - A program that allows you to take screenshots and share any file type
+    Copyright (C) 2007-2014 ShareX Developers
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License
+    as published by the Free Software Foundation; either version 2
+    of the License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+    Optionally you can also view the license at <http://www.gnu.org/licenses/>.
+*/
+
+#endregion License Information (GPL v3)
+
+using HelpersLib;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
diff --git a/UploadersLib/FileUploaders/FTP.cs b/UploadersLib/FileUploaders/FTP.cs
index 5c3818804..02705d82c 100644
--- a/UploadersLib/FileUploaders/FTP.cs
+++ b/UploadersLib/FileUploaders/FTP.cs
@@ -110,7 +110,8 @@ public override UploadResult Upload(Stream stream, string fileName)
             UploadResult result = new UploadResult();
 
             fileName = Helpers.GetValidURL(fileName);
-            string path = Account.GetSubFolderPath(fileName);
+            string subFolderPath = Account.GetSubFolderPath();
+            string path = subFolderPath.CombineURL(fileName);
             bool uploadResult;
 
             try
@@ -126,7 +127,7 @@ public override UploadResult Upload(Stream stream, string fileName)
 
             if (uploadResult && !StopUploadRequested && !IsError)
             {
-                result.URL = Account.GetUriPath(fileName);
+                result.URL = Account.GetUriPath(fileName, subFolderPath);
             }
 
             return result;
diff --git a/UploadersLib/FileUploaders/FTP/FTPAccount.cs b/UploadersLib/FileUploaders/FTP/FTPAccount.cs
index 8aab85137..8cdadbce4 100644
--- a/UploadersLib/FileUploaders/FTP/FTPAccount.cs
+++ b/UploadersLib/FileUploaders/FTP/FTPAccount.cs
@@ -158,7 +158,7 @@ public string GetHttpHomePath()
             return NameParser.Parse(NameParserType.URL, HttpHomePath.Replace("%host", Host));
         }
 
-        public string GetUriPath(string filename)
+        public string GetUriPath(string filename, string subFolderPath = null)
         {
             if (string.IsNullOrEmpty(Host))
             {
@@ -172,7 +172,11 @@ public string GetUriPath(string filename)
 
             filename = URLHelpers.URLEncode(filename);
 
-            string subFolderPath = GetSubFolderPath();
+            if (subFolderPath == null)
+            {
+                subFolderPath = GetSubFolderPath();
+            }
+
             subFolderPath = URLHelpers.URLPathEncode(subFolderPath);
 
             string httpHomePath = GetHttpHomePath();
diff --git a/UploadersLib/FileUploaders/SFTP.cs b/UploadersLib/FileUploaders/SFTP.cs
index 95f0ceffc..a1c5b787f 100644
--- a/UploadersLib/FileUploaders/SFTP.cs
+++ b/UploadersLib/FileUploaders/SFTP.cs
@@ -68,7 +68,8 @@ public override UploadResult Upload(Stream stream, string fileName)
             UploadResult result = new UploadResult();
 
             fileName = Helpers.GetValidURL(fileName);
-            string path = Account.GetSubFolderPath(fileName);
+            string subFolderPath = Account.GetSubFolderPath();
+            string path = subFolderPath.CombineURL(fileName);
             bool uploadResult;
 
             try
@@ -84,7 +85,7 @@ public override UploadResult Upload(Stream stream, string fileName)
 
             if (uploadResult && !StopUploadRequested && !IsError)
             {
-                result.URL = Account.GetUriPath(fileName);
+                result.URL = Account.GetUriPath(fileName, subFolderPath);
             }
 
             return result;