[CLI] Ensure defaults for String ^ type values in RegisteredEvent…

… and `VariableRequest` structs (fixes possible null exceptions in some cases). (Fix take 2.)
mpaperno · Mar 2, 2024 · 1632ed1 · 1632ed1
1 parent 5621129
commit 1632ed1
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/WASimClient_CLI/Structs.h b/src/WASimClient_CLI/Structs.h
@@ -474,14 +474,14 @@ namespace WASimCommander::CLI::Structs
 	{
 		public:
 			UInt32 eventId;
-			String ^code;
-			String ^name;
+			String ^ code { String::Empty };
+			String ^ name { String::Empty };
 
 			RegisteredEvent() {}
 			explicit RegisteredEvent(UInt32 eventId, String ^code) :
-				eventId{eventId}, code{code}, name{""} {}
+				eventId{eventId}, code{code} { }
 			explicit RegisteredEvent(UInt32 eventId, String ^code, String ^name) :
-				eventId{eventId}, code{code}, name{name} {}
+				eventId{eventId}, code{code}, name{name} { }
 
 			String ^ToString() override {
 				return String::Format("RegisteredEvent {{{0}; code: {1}; name: {2}}}", eventId, code, name);
@@ -506,8 +506,8 @@ namespace WASimCommander::CLI::Structs
 	{
 		public:
 			SByte variableType { 'L' };
-			String ^ variableName;
-			String ^ unitName;
+			String ^ variableName { String::Empty };
+			String ^ unitName { String::Empty };
 			int variableId { -1 };
 			int unitId { -1 };
 			Byte simVarIndex { 0 };