From f469e0cc878705d1a3b25eb3b1892d892d92a6ed Mon Sep 17 00:00:00 2001
From: Jaex <Jaex@users.noreply.github.com>
Date: Sat, 13 Sep 2014 10:36:16 +0300
Subject: [PATCH] fixed #272: Error handling for stopping FTP uploads

---
 ScreenCaptureLib/Forms/RectangleRegion.cs              |  2 +-
 ScreenCaptureLib/ScreenCaptureLib.csproj               |  2 +-
 ...{WindowsListAdvanced.cs => WindowsRectangleList.cs} |  2 +-
 UploadersLib/FileUploaders/FTP.cs                      | 10 +++++++++-
 UploadersLib/FileUploaders/SFTP.cs                     | 10 +++++++++-
 5 files changed, 21 insertions(+), 5 deletions(-)
 rename ScreenCaptureLib/{WindowsListAdvanced.cs => WindowsRectangleList.cs} (98%)

diff --git a/ScreenCaptureLib/Forms/RectangleRegion.cs b/ScreenCaptureLib/Forms/RectangleRegion.cs
index d7e604522..051dadf69 100644
--- a/ScreenCaptureLib/Forms/RectangleRegion.cs
+++ b/ScreenCaptureLib/Forms/RectangleRegion.cs
@@ -140,7 +140,7 @@ public override void Prepare()
 
                     TaskEx.Run(() =>
                     {
-                        WindowsListAdvanced wla = new WindowsListAdvanced();
+                        WindowsRectangleList wla = new WindowsRectangleList();
                         wla.IgnoreHandle = handle;
                         wla.IncludeChildWindows = AreaManager.IncludeControls;
                         AreaManager.Windows = wla.GetWindowsRectangleList();
diff --git a/ScreenCaptureLib/ScreenCaptureLib.csproj b/ScreenCaptureLib/ScreenCaptureLib.csproj
index 9f0d0268b..2485427f6 100644
--- a/ScreenCaptureLib/ScreenCaptureLib.csproj
+++ b/ScreenCaptureLib/ScreenCaptureLib.csproj
@@ -119,7 +119,7 @@
     <Compile Include="Screenshot_Transparent.cs" />
     <Compile Include="WindowInfo.cs" />
     <Compile Include="WindowsList.cs" />
-    <Compile Include="WindowsListAdvanced.cs" />
+    <Compile Include="WindowsRectangleList.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\HelpersLib\HelpersLib.csproj">
diff --git a/ScreenCaptureLib/WindowsListAdvanced.cs b/ScreenCaptureLib/WindowsRectangleList.cs
similarity index 98%
rename from ScreenCaptureLib/WindowsListAdvanced.cs
rename to ScreenCaptureLib/WindowsRectangleList.cs
index 5b54d7c63..a1ddaa590 100644
--- a/ScreenCaptureLib/WindowsListAdvanced.cs
+++ b/ScreenCaptureLib/WindowsRectangleList.cs
@@ -31,7 +31,7 @@
 
 namespace ScreenCaptureLib
 {
-    public class WindowsListAdvanced
+    public class WindowsRectangleList
     {
         public IntPtr IgnoreHandle { get; set; }
         public bool IncludeChildWindows { get; set; }
diff --git a/UploadersLib/FileUploaders/FTP.cs b/UploadersLib/FileUploaders/FTP.cs
index 02705d82c..eb04dd0b7 100644
--- a/UploadersLib/FileUploaders/FTP.cs
+++ b/UploadersLib/FileUploaders/FTP.cs
@@ -138,7 +138,15 @@ public override void StopUpload()
             if (IsUploading && !StopUploadRequested)
             {
                 StopUploadRequested = true;
-                Disconnect();
+
+                try
+                {
+                    Disconnect();
+                }
+                catch (Exception e)
+                {
+                    DebugHelper.WriteException(e);
+                }
             }
         }
 
diff --git a/UploadersLib/FileUploaders/SFTP.cs b/UploadersLib/FileUploaders/SFTP.cs
index a1c5b787f..e62e71dc7 100644
--- a/UploadersLib/FileUploaders/SFTP.cs
+++ b/UploadersLib/FileUploaders/SFTP.cs
@@ -96,7 +96,15 @@ public override void StopUpload()
             if (IsUploading && !StopUploadRequested)
             {
                 StopUploadRequested = true;
-                Disconnect();
+
+                try
+                {
+                    Disconnect();
+                }
+                catch (Exception e)
+                {
+                    DebugHelper.WriteException(e);
+                }
             }
         }