Merge branch 'hotfix-0.9.2'

norrisng · Apr 4, 2020 · ec55d98 · ec55d98
2 parents 21d86dc + e06f81b
commit ec55d98
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/FcomClient/FcomClient.Serialization/ApiManager.cs b/FcomClient/FcomClient.Serialization/ApiManager.cs
@@ -14,7 +14,7 @@ class ApiManager
 		/// <summary>
 		/// User agent string to use.
 		/// </summary>
-		private readonly string CLIENT_VERSION = "FcomClient/0.9.1";
+		private readonly string CLIENT_VERSION = "FcomClient/0.9.2";
 
 		/// <summary>
 		/// Server address, read from the file server_location.txt

diff --git a/FcomClient/FcomClient.Serialization/FcomApiException.cs b/FcomClient/FcomClient.Serialization/FcomApiException.cs
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FcomClient.Serialization
 {

diff --git a/FcomClient/FcomClient.UI/FcomClient.cs b/FcomClient/FcomClient.UI/FcomClient.cs
@@ -239,9 +239,15 @@ static void OnIncomingFsdPacket(object sender, CaptureEventArgs e)
 			// FsdPacket trims the newline, so we have to grab the byte[] ourselves
 			string pktString = System.Text.Encoding.UTF8.GetString(e.Packet.Data);
 
-			string[] inputs = pktString.Split('\n');
-			foreach (string input in inputs)
+			string[] inputs = pktString.Split(new String[] { "\n" }, StringSplitOptions.None);
+			foreach (string line in inputs)
 			{
+				// Strip out the garbage that appears in between FSD packets
+				string input = Regex.Replace(line, "^.*\\$", "$", RegexOptions.Multiline);
+				input = Regex.Replace(input, "^.*#", "#", RegexOptions.Multiline);
+				input = Regex.Replace(input, "^.*%", "%", RegexOptions.Multiline);
+				input = Regex.Replace(input, "^.*@", "@", RegexOptions.Multiline);
+
 				// First, create a FsdPacket object from the packet
 				FsdPacket currPacket = new FsdPacket(timestamp, input);
 

diff --git a/FcomClient/Properties/AssemblyInfo.cs b/FcomClient/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("0.9")]
-[assembly: AssemblyFileVersion("0.9.1")]
+[assembly: AssemblyVersion("0.9.2")]
+//[assembly: AssemblyFileVersion("0.9.2")]
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 The client that capture messages received over VATSIM / IVAO
 
-Version 0.9.1
+Version 0.9.2
 
 ## Requirements ##