Skip to content
Permalink
Browse files

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

  • Loading branch information...
getnamo committed Nov 3, 2017
2 parents 26d5060 + 9287a29 commit 2b118c4ca27eef923b93dc15f97fca00fd448753
Showing with 10 additions and 2 deletions.
  1. +1 −1 SocketIOClient.uplugin
  2. +9 −1 Source/SIOJson/Private/SIOJsonValue.cpp
@@ -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",
@@ -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

0 comments on commit 2b118c4

Please sign in to comment.
You can’t perform that action at this time.