From 660c1379588a782ea70cb8fa9d188bd2a010e86a Mon Sep 17 00:00:00 2001 From: Simon Jarrett Date: Tue, 18 Aug 2020 14:27:35 +0100 Subject: [PATCH] Refactor Version to use new JSON library --- src/openrct2/Version.cpp | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/src/openrct2/Version.cpp b/src/openrct2/Version.cpp index 3311a1e6c1..94e07095f5 100644 --- a/src/openrct2/Version.cpp +++ b/src/openrct2/Version.cpp @@ -81,24 +81,12 @@ NewVersionInfo get_latest_version() return {}; } - json_t* root = Json::FromString(res.body); + json_t root = Json::FromString(res.body); - auto get_as_string = [root](std::string name) { - std::string value; - json_t* json_value = json_object_get(root, name.c_str()); - if (json_is_string(json_value)) - { - value = (json_string_value(json_value)); - } - return value; - }; - - verinfo.tag = get_as_string("tag_name"); - verinfo.name = get_as_string("name"); - verinfo.changelog = get_as_string("body"); - verinfo.url = get_as_string("html_url"); - - json_decref(root); + verinfo.tag = Json::GetString(root["tag_name"]); + verinfo.name = Json::GetString(root["name"]); + verinfo.changelog = Json::GetString(root["body"]); + verinfo.url = Json::GetString(root["html_url"]); gConfigGeneral.last_version_check_time = now; config_save_default();