Merge pull request #604 from johncbaur/VIX-3552

VIX-3552 Removing IPAddress Serialization Exception
VixenLights · Jul 5, 2024 · 834b95c · 834b95c
2 parents 5023d76 + bd2cd6f
commit 834b95c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/src/Vixen.Modules/Controller/DDP/DDP.cs b/src/Vixen.Modules/Controller/DDP/DDP.cs
@@ -3,6 +3,7 @@
 using Vixen.Commands;
 using System.Net.Sockets;
 using System.Windows.Forms;
+using System.Net;
 
 namespace VixenModules.Output.DDP
 {
@@ -75,7 +76,7 @@ public override bool Setup()
 			DDPSetup setup = new DDPSetup(_data);
 			if (setup.ShowDialog() == DialogResult.OK) {
 				if (setup.Address != null)
-					_data.Address = setup.Address;
+					_data.Address = setup.Address.ToString();
 				OpenConnection();
 				return true;
 			}
@@ -253,7 +254,7 @@ public override ControllerNetworkConfiguration GetNetworkConfiguration()
 		{
 			var config = new ControllerNetworkConfiguration();
 			config.SupportsUniverses = true;
-			config.IpAddress = _data.Address;
+			config.IpAddress = IPAddress.Parse(_data.Address);
 			config.ProtocolType = ProtocolTypes.DDP;
 			config.TransmissionMethod = TransmissionMethods.Unicast;
 			var universes = new List<UniverseConfiguration>(1);

diff --git a/src/Vixen.Modules/Controller/DDP/DDPData.cs b/src/Vixen.Modules/Controller/DDP/DDPData.cs
@@ -8,17 +8,17 @@ namespace VixenModules.Output.DDP
 	public class DDPData : ModuleDataModelBase
 	{
 		[DataMember]
-		public IPAddress Address { get; set; }
+		public string Address { get; set; }
 
 		public DDPData()
 		{
-			Address = new IPAddress(new byte[] {127, 0, 0, 1});
+			Address = "127, 0, 0, 1";
 		}
 
 		public override IModuleDataModel Clone()
 		{
 			DDPData result = new DDPData();
-			result.Address = new IPAddress(Address.GetAddressBytes());
+			result.Address = Address;
 			return result;
 		}
 	}

diff --git a/src/Vixen.Modules/Controller/DDP/DDPSetup.cs b/src/Vixen.Modules/Controller/DDP/DDPSetup.cs
@@ -13,8 +13,8 @@ public DDPSetup(DDPData data)
 			InitializeComponent();
 			ForeColor = ThemeColorTable.ForeColor;
 			BackColor = ThemeColorTable.BackgroundColor;
-			ThemeUpdateControls.UpdateControls(this);
-			Address = data.Address;
+			ThemeUpdateControls.UpdateControls(this);			
+			Address = IPAddress.Parse(data.Address);
 		}
 
 		public IPAddress Address