From 84cc96eccef19781c0b84b03c9415158395ebc60 Mon Sep 17 00:00:00 2001 From: airxiti Date: Fri, 30 Oct 2026 17:04:17 +0100 Subject: [PATCH] fix: use null unit when subscribing to string SimVars --- src/SimConnect.NET/SimConnectNative.cs | 2 +- src/SimConnect.NET/SimVar/SimVarManager.cs | 21 +++++++++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/SimConnect.NET/SimConnectNative.cs b/src/SimConnect.NET/SimConnectNative.cs index 55683f0..f5616ae 100644 --- a/src/SimConnect.NET/SimConnectNative.cs +++ b/src/SimConnect.NET/SimConnectNative.cs @@ -170,7 +170,7 @@ public static extern int SimConnect_AddToDataDefinition( IntPtr hSimConnect, uint defineId, [MarshalAs(UnmanagedType.LPStr)] string datumName, - [MarshalAs(UnmanagedType.LPStr)] string unitsName, + [MarshalAs(UnmanagedType.LPStr)] string? unitsName, uint datumType = 4, float fEpsilon = 0, uint datumId = SimConnectUnused); diff --git a/src/SimConnect.NET/SimVar/SimVarManager.cs b/src/SimConnect.NET/SimVar/SimVarManager.cs index 1bbad3c..6ef07e0 100644 --- a/src/SimConnect.NET/SimVar/SimVarManager.cs +++ b/src/SimConnect.NET/SimVar/SimVarManager.cs @@ -519,6 +519,14 @@ internal void CancelRequest(ISimVarRequest request) request.SetCanceled(); } + private static bool IsStringDataType(SimConnectDataType dataType) => + dataType is SimConnectDataType.String8 + or SimConnectDataType.String32 + or SimConnectDataType.String64 + or SimConnectDataType.String128 + or SimConnectDataType.String256 + or SimConnectDataType.String260; + private static SimConnectDataType InferDataType() { var type = typeof(T); @@ -850,12 +858,21 @@ private uint EnsureScalarDefinition(string name, string? unit = null, SimConnect } } - if (unit == null || dataType is not SimConnectDataType dt) + if (dataType is not SimConnectDataType dt) + { + throw new ArgumentException($"Unit and dataType must not be null for SimVar '{name}'."); + } + + if (IsStringDataType(dt)) + { + unit = null; + } + else if (unit is null) { throw new ArgumentException($"Unit and dataType must not be null for SimVar '{name}'."); } - var key = (Name: name, Unit: unit, DataType: dt); + var key = (Name: name, Unit: unit ?? string.Empty, DataType: dt); if (this.dataDefinitions.TryGetValue(key, out var existingId)) {