Merge pull request #775 from AntonyCorbett/fix/external-preview

RickStrahl · web-flow · commit ccb7108f9bc0 · 2021-04-08T13:27:17.000-10:00
Fix/external preview
diff --git a/AddIns/ScreenCaptureAddin/SnagItAutomation.cs b/AddIns/ScreenCaptureAddin/SnagItAutomation.cs
@@ -489,12 +489,14 @@ protected void SetError(Exception ex, bool checkInner = false)
         {
             if (ex == null)
                 ErrorMessage = string.Empty;
+            else
+            {
+                Exception e = ex;
+                if (checkInner)
+                    e = e.GetBaseException();
 
-            Exception e = ex;
-            if (checkInner)
-                e = e.GetBaseException();
-
-            ErrorMessage = e.Message;
+                ErrorMessage = e.Message;
+            }
         }
 
     }
diff --git a/AddIns/WebLogAddin/LocalJekyll/LocalJekyllPublisher.cs b/AddIns/WebLogAddin/LocalJekyll/LocalJekyllPublisher.cs
@@ -580,12 +580,14 @@ protected void SetError(Exception ex, bool checkInner = false)
         {
             if (ex == null)
                 ErrorMessage = string.Empty;
+            else
+            {
+                Exception e = ex;
+                if (checkInner)
+                    e = e.GetBaseException();
 
-            Exception e = ex;
-            if (checkInner)
-                e = e.GetBaseException();
-
-            ErrorMessage = e.Message;
+                ErrorMessage = e.Message;
+            }
         }
         #endregion
     }
diff --git a/AddIns/WebLogAddin/MetaWebLogApi/helpers/FileSystemHelper.cs b/AddIns/WebLogAddin/MetaWebLogApi/helpers/FileSystemHelper.cs
@@ -16,10 +16,12 @@ static class FileSystemHelper
         /// <returns></returns>
         public static byte[] GetFileBytes(string pathToFile)
         {
-            var fs = new FileStream(pathToFile, FileMode.Open, FileAccess.Read);
-            byte[] filebytes = new byte[fs.Length];
-            fs.Read(filebytes, 0, Convert.ToInt32(fs.Length));
-            return filebytes;
+            using (var fs = new FileStream(pathToFile, FileMode.Open, FileAccess.Read))
+            {
+                byte[] filebytes = new byte[fs.Length];
+                fs.Read(filebytes, 0, Convert.ToInt32(fs.Length));
+                return filebytes;
+            }
         }
     }
 }
diff --git a/MarkdownMonster/Controls/ContextMenus/EditorContextMenu.cs b/MarkdownMonster/Controls/ContextMenus/EditorContextMenu.cs
@@ -573,8 +573,10 @@ private bool CheckForImageLink(string line, AcePosition pos)
 
                                 try
                                 {
-                                    var wc = new WebClient();
-                                    await wc.DownloadFileTaskAsync(new Uri(imageLink), sd.FileName);
+                                    using (var wc = new WebClient())
+                                    {
+                                        await wc.DownloadFileTaskAsync(new Uri(imageLink), sd.FileName);
+                                    }
 
                                     string filename;
                                     if (doc.Filename.Equals("untitled", StringComparison.OrdinalIgnoreCase))
diff --git a/MarkdownMonster/Windows/ConfigurationEditor/ConfigurationParser.cs b/MarkdownMonster/Windows/ConfigurationEditor/ConfigurationParser.cs
@@ -109,12 +109,14 @@ protected void SetError(Exception ex, bool checkInner = false)
         {
             if (ex == null)
                 ErrorMessage = string.Empty;
+            else
+            {
+                Exception e = ex;
+                if (checkInner)
+                    e = e.GetBaseException();
 
-            Exception e = ex;
-            if (checkInner)
-                e = e.GetBaseException();
-
-            ErrorMessage = e.Message;
+                ErrorMessage = e.Message;
+            }
         }
 
 
diff --git a/MarkdownMonster/Windows/PreviewBrowser/PreviewBrowserWindow.xaml.cs b/MarkdownMonster/Windows/PreviewBrowser/PreviewBrowserWindow.xaml.cs
@@ -84,8 +84,9 @@ protected override void OnClosing(CancelEventArgs e)
         {            
             IsClosed = true;
 
-            var config = mmApp.Model.Configuration.WindowPosition;
+            mmApp.Model.IsPreviewBrowserVisible = false;
 
+            var config = mmApp.Model.Configuration.WindowPosition;
 
             config.PreviewLeft = Convert.ToInt32(Left);
             config.PreviewTop = Convert.ToInt32(Top);
diff --git a/MarkdownMonster/Windows/TableEditor/TableEditor.xaml.cs b/MarkdownMonster/Windows/TableEditor/TableEditor.xaml.cs
@@ -292,10 +292,6 @@ public void CreateTableFromClipboardHtml(string html = null)
             {
                 data = parser.ParseMarkdownToData(html);
             }
-            else if (html.Contains("-|-") || html.Contains("- | -") || html.Contains(""))
-            {
-                data = parser.ParseMarkdownToData(html);
-            }
             else if (html.Contains("-+-"))
             {
                 data = parser.ParseMarkdownGridTableToData(html);
diff --git a/MarkdownMonster/_Classes/BrowserComInterop/BaseBrowserInterop.cs b/MarkdownMonster/_Classes/BrowserComInterop/BaseBrowserInterop.cs
@@ -34,7 +34,7 @@ public object Instance
             set
             {
                 _instance = value;
-                InstanceType = _instance.GetType();
+                InstanceType = _instance?.GetType();
             }
         }
         private object _instance;
@@ -74,7 +74,7 @@ public object Invoke(string method, params object[] parameters)
             try
             {
 #endif
-            return InstanceType.InvokeMember(method, flags | BindingFlags.InvokeMethod, null, Instance,
+            return InstanceType?.InvokeMember(method, flags | BindingFlags.InvokeMethod, null, Instance,
                 parameters );
 #if DEBUG
             }
diff --git a/MarkdownMonster/_Classes/Utilities/GitHelper.cs b/MarkdownMonster/_Classes/Utilities/GitHelper.cs
@@ -1002,12 +1002,14 @@ protected void SetError(Exception ex, bool checkInner = false)
         {
             if (ex == null)
                 this.ErrorMessage = string.Empty;
+            else
+            {
+                Exception e = ex;
+                if (checkInner)
+                    e = e.GetBaseException();
 
-            Exception e = ex;
-            if (checkInner)
-                e = e.GetBaseException();
-
-            ErrorMessage = e.Message;
+                ErrorMessage = e.Message;
+            }
         }
         #endregion
 
diff --git a/MarkdownMonster/_Classes/Utilities/HtmlPackager.cs b/MarkdownMonster/_Classes/Utilities/HtmlPackager.cs
@@ -345,8 +345,10 @@ private void ProcessCss(HtmlDocument doc)
                 {
                     if (url.StartsWith("http"))
                     {
-                        var http = new WebClient();
-                        cssText = http.DownloadString(url);
+                        using (var http = new WebClient())
+                        {
+                            cssText = http.DownloadString(url);
+                        }
                     }
                     else if (url.StartsWith("file:///"))
                     {
@@ -359,8 +361,10 @@ private void ProcessCss(HtmlDocument doc)
                         url = uri.AbsoluteUri;
                         if (url.StartsWith("http") && url.Contains("://"))
                         {
-                            var http = new WebClient();
-                            cssText = http.DownloadString(url);
+                            using (var http = new WebClient())
+                            {
+                                cssText = http.DownloadString(url);
+                            }
                         }
                         else
                             cssText = File.ReadAllText(uri.LocalPath);
@@ -418,8 +422,10 @@ private void ProcessScripts(HtmlDocument doc)
                 {
                     if (url.StartsWith("http"))
                     {
-                        var http = new WebClient();
-                        scriptData = http.DownloadData(url);
+                        using (var http = new WebClient())
+                        {
+                            scriptData = http.DownloadData(url);
+                        }
                     }
                     else if (url.StartsWith("file:///"))
                     {
@@ -432,8 +438,10 @@ private void ProcessScripts(HtmlDocument doc)
                         url = uri.AbsoluteUri;
                         if (url.StartsWith("http") && url.Contains("://"))
                         {
-                            var http = new WebClient();
-                            scriptData = http.DownloadData(url);
+                            using (var http = new WebClient())
+                            {
+                                scriptData = http.DownloadData(url);
+                            }
                         }
                         else
                             scriptData = File.ReadAllBytes(uri.LocalPath);
@@ -483,9 +491,11 @@ private void ProcessImages(HtmlDocument doc)
                 {
                     if (url.StartsWith("http"))
                     {
-                        var http = new WebClient();
-                        imageData = http.DownloadData(url);
-                        contentType = http.ResponseHeaders[System.Net.HttpResponseHeader.ContentType];
+                        using (var http = new WebClient())
+                        {
+                            imageData = http.DownloadData(url);
+                            contentType = http.ResponseHeaders[System.Net.HttpResponseHeader.ContentType];
+                        }
                     }
                     else if (url.StartsWith("file:///"))
                     {
@@ -499,8 +509,10 @@ private void ProcessImages(HtmlDocument doc)
                         
                         if (uri.Scheme.StartsWith("http"))
                         {
-                            var http = new WebClient();
-                            imageData = http.DownloadData(uri.AbsoluteUri);
+                            using (var http = new WebClient())
+                            {
+                                imageData = http.DownloadData(uri.AbsoluteUri);
+                            }
                         }
                         else
                             imageData = File.ReadAllBytes(uri.LocalPath);
@@ -581,9 +593,11 @@ private string ProcessUrls(string html, string baseUrl)
                 {
                     if (url.StartsWith("http"))
                     {
-                        var http = new WebClient();
-                        linkData = http.DownloadData(url);
-                        contentType = http.ResponseHeaders[HttpResponseHeader.ContentType];
+                        using (var http = new WebClient())
+                        {
+                            linkData = http.DownloadData(url);
+                            contentType = http.ResponseHeaders[HttpResponseHeader.ContentType];
+                        }
                     }
                     else if (url.StartsWith("file:///"))
                     {
@@ -602,8 +616,10 @@ private string ProcessUrls(string html, string baseUrl)
                         url = uri.AbsoluteUri;
                         if (url.StartsWith("http") && url.Contains("://"))
                         {
-                            var http = new WebClient();
-                            linkData = http.DownloadData(url);
+                            using (var http = new WebClient())
+                            {
+                                linkData = http.DownloadData(url);
+                            }
                         }
                         else
                             linkData = File.ReadAllBytes(uri.LocalPath);
@@ -673,12 +689,14 @@ protected void SetError(Exception ex, bool checkInner = false)
         {
             if (ex == null)
                 this.ErrorMessage = string.Empty;
+            else
+            {
+                Exception e = ex;
+                if (checkInner)
+                    e = e.GetBaseException();
 
-            Exception e = ex;
-            if (checkInner)
-                e = e.GetBaseException();
-
-            ErrorMessage = e.Message;
+                ErrorMessage = e.Message;
+            }
         }
         #endregion
     }
diff --git a/MarkdownMonster/_Classes/Utilities/HtmlToPdfGeneration.cs b/MarkdownMonster/_Classes/Utilities/HtmlToPdfGeneration.cs
@@ -296,12 +296,14 @@ protected void SetError(Exception ex, bool checkInner = false)
         {
             if (ex == null)
                 ErrorMessage = string.Empty;
+            else
+            {
+                Exception e = ex;
+                if (checkInner)
+                    e = e.GetBaseException();
 
-            Exception e = ex;
-            if (checkInner)
-                e = e.GetBaseException();
-
-            ErrorMessage = e.Message;
+                ErrorMessage = e.Message;
+            }
         }
         #endregion
 
diff --git a/MarkdownMonster/_Classes/Utilities/SpellChecker.cs b/MarkdownMonster/_Classes/Utilities/SpellChecker.cs
@@ -175,14 +175,16 @@ public static bool DownloadDictionary(string language, string basePath = null)
                         Directory.CreateDirectory(basePath);
 
                     var dicFile = Path.Combine(basePath, language + ".dic");
-                    var web = new WebClient();
-                    web.DownloadFile(new Uri(url), dicFile);
+                    using (var web = new WebClient())
+                    {
+                        web.DownloadFile(new Uri(url), dicFile);
 
-                    var affFile = dicFile.Replace(".dic", ".aff");
-                    url = url.Replace(".dic", ".aff");
-                    web.DownloadFile(new Uri(url), affFile);
+                        var affFile = dicFile.Replace(".dic", ".aff");
+                        url = url.Replace(".dic", ".aff");
+                        web.DownloadFile(new Uri(url), affFile);
 
-                    return File.Exists(dicFile) && File.Exists(affFile);
+                        return File.Exists(dicFile) && File.Exists(affFile);
+                    }
                 }
             }
             catch(Exception ex)
@@ -203,9 +205,6 @@ public static bool AskForLicenseAcceptance(string language)
             mmApp.Model.Window.ShowStatusProgress($"Downloading dictionary license for {language}");
 
             //download license
-            var wc = new WebClient();
-            wc.Encoding = Encoding.UTF8;
-
             var url = $"https://raw.githubusercontent.com/wooorm/dictionaries/main/dictionaries/{language}/license";
             
             var dd = DictionaryDownloads.FirstOrDefault(dx => dx.Code == language);
@@ -215,7 +214,11 @@ public static bool AskForLicenseAcceptance(string language)
             string md;
             try
             {
-                md = wc.DownloadString(url);
+                using (var wc = new WebClient())
+                {
+                    wc.Encoding = Encoding.UTF8;
+                    md = wc.DownloadString(url);
+                }
             }
             catch
             {
diff --git a/MarkdownMonster/_Classes/Utilities/mmFileUtils.cs b/MarkdownMonster/_Classes/Utilities/mmFileUtils.cs
@@ -500,7 +500,7 @@ public static bool OpenImageInImageEditor(string imageFileOrUrl)
                 return false;
 
 
-            if (imageFileOrUrl.StartsWith("https://") || imageFileOrUrl.StartsWith("https://"))
+            if (imageFileOrUrl.StartsWith("http://") || imageFileOrUrl.StartsWith("https://"))
             {
                 var imageFile = HttpUtils.DownloadImageToFile(imageFileOrUrl);
 
@@ -517,7 +517,7 @@ public static bool OpenImageInImageEditor(string imageFileOrUrl)
             {
                 string exe = mmApp.Configuration.Images.ImageEditor;
                 if (!string.IsNullOrEmpty(exe))
-                    Process.Start(new ProcessStartInfo(exe, $"\"{imageFileOrUrl}\""));
+                    Process.Start(new ProcessStartInfo(exe, $"\"{Path.GetFullPath(imageFileOrUrl)}\""));
                 else
                 {
                     Process.Start(new ProcessStartInfo
@@ -548,7 +548,7 @@ public static bool OpenImageInImageViewer(string imageFile)
             {
                 string exe = mmApp.Configuration.Images.ImageViewer;
                 if (!string.IsNullOrEmpty(exe))
-                    Process.Start(new ProcessStartInfo(exe, $"\"{imageFile}\""));
+                    Process.Start(new ProcessStartInfo(exe, $"\"{Path.GetFullPath(imageFile)}\""));
                 else
                 {
                     Process.Start(new ProcessStartInfo {FileName = imageFile, UseShellExecute = true});

Original file line number	Diff line number	Diff line change
`@@ -489,12 +489,14 @@ protected void SetError(Exception ex, bool checkInner = false)`
`489`	`489`	`{`
`490`	`490`	`if (ex == null)`
`491`	`491`	`ErrorMessage = string.Empty;`
	`492`	`+ else`
	`493`	`+ {`
	`494`	`+ Exception e = ex;`
	`495`	`+ if (checkInner)`
	`496`	`+ e = e.GetBaseException();`
`492`	`497`
`493`		`- Exception e = ex;`
`494`		`- if (checkInner)`
`495`		`- e = e.GetBaseException();`
`496`		`-`
`497`		`- ErrorMessage = e.Message;`
	`498`	`+ ErrorMessage = e.Message;`
	`499`	`+ }`
`498`	`500`	`}`
`499`	`501`
`500`	`502`	`}`
Original file line number	Diff line number	Diff line change
`@@ -580,12 +580,14 @@ protected void SetError(Exception ex, bool checkInner = false)`
`580`	`580`	`{`
`581`	`581`	`if (ex == null)`
`582`	`582`	`ErrorMessage = string.Empty;`
	`583`	`+ else`
	`584`	`+ {`
	`585`	`+ Exception e = ex;`
	`586`	`+ if (checkInner)`
	`587`	`+ e = e.GetBaseException();`
`583`	`588`
`584`		`- Exception e = ex;`
`585`		`- if (checkInner)`
`586`		`- e = e.GetBaseException();`
`587`		`-`
`588`		`- ErrorMessage = e.Message;`
	`589`	`+ ErrorMessage = e.Message;`
	`590`	`+ }`
`589`	`591`	`}`
`590`	`592`	`#endregion`
`591`	`593`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,10 +16,12 @@ static class FileSystemHelper`
`16`	`16`	`/// <returns></returns>`
`17`	`17`	`public static byte[] GetFileBytes(string pathToFile)`
`18`	`18`	`{`
`19`		`- var fs = new FileStream(pathToFile, FileMode.Open, FileAccess.Read);`
`20`		`- byte[] filebytes = new byte[fs.Length];`
`21`		`- fs.Read(filebytes, 0, Convert.ToInt32(fs.Length));`
`22`		`- return filebytes;`
	`19`	`+ using (var fs = new FileStream(pathToFile, FileMode.Open, FileAccess.Read))`
	`20`	`+ {`
	`21`	`+ byte[] filebytes = new byte[fs.Length];`
	`22`	`+ fs.Read(filebytes, 0, Convert.ToInt32(fs.Length));`
	`23`	`+ return filebytes;`
	`24`	`+ }`
`23`	`25`	`}`
`24`	`26`	`}`
`25`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,8 +84,9 @@ protected override void OnClosing(CancelEventArgs e)`
`84`	`84`	`{`
`85`	`85`	`IsClosed = true;`
`86`	`86`
`87`		`- var config = mmApp.Model.Configuration.WindowPosition;`
	`87`	`+ mmApp.Model.IsPreviewBrowserVisible = false;`
`88`	`88`
	`89`	`+ var config = mmApp.Model.Configuration.WindowPosition;`
`89`	`90`
`90`	`91`	`config.PreviewLeft = Convert.ToInt32(Left);`
`91`	`92`	`config.PreviewTop = Convert.ToInt32(Top);`
Original file line number	Diff line number	Diff line change
`@@ -292,10 +292,6 @@ public void CreateTableFromClipboardHtml(string html = null)`
`292`	`292`	`{`
`293`	`293`	`data = parser.ParseMarkdownToData(html);`
`294`	`294`	`}`
`295`		`- else if (html.Contains("-\|-") \|\| html.Contains("- \| -") \|\| html.Contains(""))`
`296`		`- {`
`297`		`- data = parser.ParseMarkdownToData(html);`
`298`		`- }`
`299`	`295`	`else if (html.Contains("-+-"))`
`300`	`296`	`{`
`301`	`297`	`data = parser.ParseMarkdownGridTableToData(html);`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public object Instance`
`34`	`34`	`set`
`35`	`35`	`{`
`36`	`36`	`_instance = value;`
`37`		`- InstanceType = _instance.GetType();`
	`37`	`+ InstanceType = _instance?.GetType();`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`	`private object _instance;`
`@@ -74,7 +74,7 @@ public object Invoke(string method, params object[] parameters)`
`74`	`74`	`try`
`75`	`75`	`{`
`76`	`76`	`#endif`
`77`		`- return InstanceType.InvokeMember(method, flags \| BindingFlags.InvokeMethod, null, Instance,`
	`77`	`+ return InstanceType?.InvokeMember(method, flags \| BindingFlags.InvokeMethod, null, Instance,`
`78`	`78`	`parameters );`
`79`	`79`	`#if DEBUG`
`80`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -345,8 +345,10 @@ private void ProcessCss(HtmlDocument doc)`
`345`	`345`	`{`
`346`	`346`	`if (url.StartsWith("http"))`
`347`	`347`	`{`
`348`		`- var http = new WebClient();`
`349`		`- cssText = http.DownloadString(url);`
	`348`	`+ using (var http = new WebClient())`
	`349`	`+ {`
	`350`	`+ cssText = http.DownloadString(url);`
	`351`	`+ }`
`350`	`352`	`}`
`351`	`353`	`else if (url.StartsWith("file:///"))`
`352`	`354`	`{`
`@@ -359,8 +361,10 @@ private void ProcessCss(HtmlDocument doc)`
`359`	`361`	`url = uri.AbsoluteUri;`
`360`	`362`	`if (url.StartsWith("http") && url.Contains("://"))`
`361`	`363`	`{`
`362`		`- var http = new WebClient();`
`363`		`- cssText = http.DownloadString(url);`
	`364`	`+ using (var http = new WebClient())`
	`365`	`+ {`
	`366`	`+ cssText = http.DownloadString(url);`
	`367`	`+ }`
`364`	`368`	`}`
`365`	`369`	`else`
`366`	`370`	`cssText = File.ReadAllText(uri.LocalPath);`
`@@ -418,8 +422,10 @@ private void ProcessScripts(HtmlDocument doc)`
`418`	`422`	`{`
`419`	`423`	`if (url.StartsWith("http"))`
`420`	`424`	`{`
`421`		`- var http = new WebClient();`
`422`		`- scriptData = http.DownloadData(url);`
	`425`	`+ using (var http = new WebClient())`
	`426`	`+ {`
	`427`	`+ scriptData = http.DownloadData(url);`
	`428`	`+ }`
`423`	`429`	`}`
`424`	`430`	`else if (url.StartsWith("file:///"))`
`425`	`431`	`{`
`@@ -432,8 +438,10 @@ private void ProcessScripts(HtmlDocument doc)`
`432`	`438`	`url = uri.AbsoluteUri;`
`433`	`439`	`if (url.StartsWith("http") && url.Contains("://"))`
`434`	`440`	`{`
`435`		`- var http = new WebClient();`
`436`		`- scriptData = http.DownloadData(url);`
	`441`	`+ using (var http = new WebClient())`
	`442`	`+ {`
	`443`	`+ scriptData = http.DownloadData(url);`
	`444`	`+ }`
`437`	`445`	`}`
`438`	`446`	`else`
`439`	`447`	`scriptData = File.ReadAllBytes(uri.LocalPath);`
`@@ -483,9 +491,11 @@ private void ProcessImages(HtmlDocument doc)`
`483`	`491`	`{`
`484`	`492`	`if (url.StartsWith("http"))`
`485`	`493`	`{`
`486`		`- var http = new WebClient();`
`487`		`- imageData = http.DownloadData(url);`
`488`		`- contentType = http.ResponseHeaders[System.Net.HttpResponseHeader.ContentType];`
	`494`	`+ using (var http = new WebClient())`
	`495`	`+ {`
	`496`	`+ imageData = http.DownloadData(url);`
	`497`	`+ contentType = http.ResponseHeaders[System.Net.HttpResponseHeader.ContentType];`
	`498`	`+ }`
`489`	`499`	`}`
`490`	`500`	`else if (url.StartsWith("file:///"))`
`491`	`501`	`{`
`@@ -499,8 +509,10 @@ private void ProcessImages(HtmlDocument doc)`
`499`	`509`
`500`	`510`	`if (uri.Scheme.StartsWith("http"))`
`501`	`511`	`{`
`502`		`- var http = new WebClient();`
`503`		`- imageData = http.DownloadData(uri.AbsoluteUri);`
	`512`	`+ using (var http = new WebClient())`
	`513`	`+ {`
	`514`	`+ imageData = http.DownloadData(uri.AbsoluteUri);`
	`515`	`+ }`
`504`	`516`	`}`
`505`	`517`	`else`
`506`	`518`	`imageData = File.ReadAllBytes(uri.LocalPath);`
`@@ -581,9 +593,11 @@ private string ProcessUrls(string html, string baseUrl)`
`581`	`593`	`{`
`582`	`594`	`if (url.StartsWith("http"))`
`583`	`595`	`{`
`584`		`- var http = new WebClient();`
`585`		`- linkData = http.DownloadData(url);`
`586`		`- contentType = http.ResponseHeaders[HttpResponseHeader.ContentType];`
	`596`	`+ using (var http = new WebClient())`
	`597`	`+ {`
	`598`	`+ linkData = http.DownloadData(url);`
	`599`	`+ contentType = http.ResponseHeaders[HttpResponseHeader.ContentType];`
	`600`	`+ }`
`587`	`601`	`}`
`588`	`602`	`else if (url.StartsWith("file:///"))`
`589`	`603`	`{`
`@@ -602,8 +616,10 @@ private string ProcessUrls(string html, string baseUrl)`
`602`	`616`	`url = uri.AbsoluteUri;`
`603`	`617`	`if (url.StartsWith("http") && url.Contains("://"))`
`604`	`618`	`{`
`605`		`- var http = new WebClient();`
`606`		`- linkData = http.DownloadData(url);`
	`619`	`+ using (var http = new WebClient())`
	`620`	`+ {`
	`621`	`+ linkData = http.DownloadData(url);`
	`622`	`+ }`
`607`	`623`	`}`
`608`	`624`	`else`
`609`	`625`	`linkData = File.ReadAllBytes(uri.LocalPath);`
`@@ -673,12 +689,14 @@ protected void SetError(Exception ex, bool checkInner = false)`
`673`	`689`	`{`
`674`	`690`	`if (ex == null)`
`675`	`691`	`this.ErrorMessage = string.Empty;`
	`692`	`+ else`
	`693`	`+ {`
	`694`	`+ Exception e = ex;`
	`695`	`+ if (checkInner)`
	`696`	`+ e = e.GetBaseException();`
`676`	`697`
`677`		`- Exception e = ex;`
`678`		`- if (checkInner)`
`679`		`- e = e.GetBaseException();`
`680`		`-`
`681`		`- ErrorMessage = e.Message;`
	`698`	`+ ErrorMessage = e.Message;`
	`699`	`+ }`
`682`	`700`	`}`
`683`	`701`	`#endregion`
`684`	`702`	`}`