Fix enum <-> byte conversion bug

getnamo · Aug 18, 2022 · 4c97f85 · 4c97f85
1 parent 7af9359
commit 4c97f85
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/SocketIOClient.uplugin b/SocketIOClient.uplugin
@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
 	"Version": 1,
-	"VersionName": "2.4.0",
+	"VersionName": "2.4.1",
 	"EngineVersion": "5.0.0",
 	"FriendlyName": "Socket.IO Client",
 	"Description": "Real-time WebSocket networking via Socket.IO protocol usable from blueprints and c++.",

diff --git a/Source/SIOJson/Private/SIOJConvert.cpp b/Source/SIOJson/Private/SIOJConvert.cpp
@@ -649,14 +649,8 @@ TSharedPtr<FJsonValue> USIOJConvert::JsonStringToJsonValue(const FString& JsonSt
 	//Object
 	if (JsonString.StartsWith(FString(TEXT("{"))))
 	{
-		TSharedPtr< FJsonObject > JsonObject = MakeShareable(new FJsonObject);
-		TSharedRef< TJsonReader<> > Reader = TJsonReaderFactory<>::Create(*JsonString);
-		bool success = FJsonSerializer::Deserialize(Reader, JsonObject);
-
-		if (success)
-		{
-			return MakeShareable(new FJsonValueObject(JsonObject));
-		}
+		TSharedPtr< FJsonObject > JsonObject = ToJsonObject(JsonString);
+		return MakeShareable(new FJsonValueObject(JsonObject));
 	}
 
 	//Array
@@ -752,7 +746,7 @@ TSharedPtr<FJsonObject> USIOJConvert::ToJsonObject(UStruct* StructDefinition, vo
 					//Override default enum behavior by fetching display name text
 					UEnum* EnumDef = BPEnumProperty->Enum;
 
-					int32 IntValue = *(int32*)Value;
+					uint8 IntValue = *(uint8*)Value;
 
 					//It's an enum byte
 					if (EnumDef)