Fix possible exception on download failure & map list line ending bug

Vauff · Vauff · commit b1edafee6720 · 2020-04-24T07:31:36.000-04:00
diff --git a/MapDownloader/FrmMain.cs b/MapDownloader/FrmMain.cs
@@ -99,7 +99,7 @@ private void btnMain_Click_Download(object sender, EventArgs e)
 
             foreach (string rawMap in mapList)
             {
-                string map = rawMap.Replace("\n", "");
+                string map = rawMap.Replace("\r\n", "").Replace("\n", "");
 
                 if (!map.Equals(""))
                 {
@@ -213,7 +213,10 @@ private async void DownloadFinished(object sender, AsyncCompletedEventArgs e)
             }
 
             prgDownload.PerformStep();
-            compressedFile.Delete();
+
+            if (compressedFile.Exists)
+                compressedFile.Delete();
+
             Download();
         }
 
diff --git a/MapDownloader/Global.cs b/MapDownloader/Global.cs
@@ -6,7 +6,7 @@ namespace MapDownloader
 {
 	public static class Global
 	{
-		public static string version = "2.0";
+		public static string version = "2.0.1";
 		public static string fastdlUrl = "";
 		public static string maplistUrl = "";
 		public static string appID = "";

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ private void btnMain_Click_Download(object sender, EventArgs e)`
`99`	`99`
`100`	`100`	`foreach (string rawMap in mapList)`
`101`	`101`	`{`
`102`		`- string map = rawMap.Replace("\n", "");`
	`102`	`+ string map = rawMap.Replace("\r\n", "").Replace("\n", "");`
`103`	`103`
`104`	`104`	`if (!map.Equals(""))`
`105`	`105`	`{`
`@@ -213,7 +213,10 @@ private async void DownloadFinished(object sender, AsyncCompletedEventArgs e)`
`213`	`213`	`}`
`214`	`214`
`215`	`215`	`prgDownload.PerformStep();`
`216`		`- compressedFile.Delete();`
	`216`	`+`
	`217`	`+ if (compressedFile.Exists)`
	`218`	`+ compressedFile.Delete();`
	`219`	`+`
`217`	`220`	`Download();`
`218`	`221`	`}`
`219`	`222`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ namespace MapDownloader`
`6`	`6`	`{`
`7`	`7`	`public static class Global`
`8`	`8`	`{`
`9`		`- public static string version = "2.0";`
	`9`	`+ public static string version = "2.0.1";`
`10`	`10`	`public static string fastdlUrl = "";`
`11`	`11`	`public static string maplistUrl = "";`
`12`	`12`	`public static string appID = "";`