Merge remote-tracking branch 'refs/remotes/origin/4.18-update'

getnamo · Nov 3, 2017 · 2b118c4 · 2b118c4
2 parents 26d5060 + 9287a29
commit 2b118c4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/SocketIOClient.uplugin b/SocketIOClient.uplugin
@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
 	"Version": 1,
-	"VersionName": "0.6.4",
+	"VersionName": "0.6.5",
 	"FriendlyName": "Socket.IO Client",
 	"Description": "Real-time networking library Socket.IO Client usable from blueprints and c++.",
 	"Category": "Networking",

diff --git a/Source/SIOJson/Private/SIOJsonValue.cpp b/Source/SIOJson/Private/SIOJsonValue.cpp
@@ -249,7 +249,15 @@ FString USIOJsonValue::AsString() const
 		return FString();
 	}
 
-	return JsonVal->AsString();
+	//Auto-convert non-strings instead of getting directly
+	if (JsonVal->Type != EJson::String)
+	{
+		return EncodeJson();
+	}
+	else
+	{
+		return JsonVal->AsString();
+	}
 }
 
 bool USIOJsonValue::AsBool() const