From 2c92c652e2b90a66c01256a1e4ceaef451029637 Mon Sep 17 00:00:00 2001 From: Simon Jarrett Date: Wed, 12 Aug 2020 23:27:34 +0100 Subject: [PATCH] Refactor ObjectLoadError to use new JSON library --- src/openrct2-ui/windows/ObjectLoadError.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/openrct2-ui/windows/ObjectLoadError.cpp b/src/openrct2-ui/windows/ObjectLoadError.cpp index 3e53d181d2..ab577616a1 100644 --- a/src/openrct2-ui/windows/ObjectLoadError.cpp +++ b/src/openrct2-ui/windows/ObjectLoadError.cpp @@ -211,18 +211,17 @@ private: if (response.status == Http::Status::OK) { auto jresponse = Json::FromString(response.body); - if (jresponse != nullptr) + if (jresponse.is_object()) { - auto objName = json_string_value(json_object_get(jresponse, "name")); - auto source = json_string_value(json_object_get(jresponse, "source")); - auto downloadLink = json_string_value(json_object_get(jresponse, "download")); - if (downloadLink != nullptr) + auto objName = Json::GetString(jresponse["name"]); + auto source = Json::GetString(jresponse["source"]); + auto downloadLink = Json::GetString(jresponse["download"]); + if (!downloadLink.empty()) { _lastDownloadSource = source; UpdateProgress({ name, source, _currentDownloadIndex, _entries.size() }); DownloadObject(entry, objName, downloadLink); } - json_decref(jresponse); } } else if (response.status == Http::Status::NotFound)