From f117bd586724df4f7bc61bd2d2aebcadd3ee535f Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 11 Feb 2016 15:38:50 -0800 Subject: [PATCH] fix check for string assets path --- assignment-client/src/assets/AssetServer.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/assignment-client/src/assets/AssetServer.cpp b/assignment-client/src/assets/AssetServer.cpp index 443fbff3b1..556813d335 100644 --- a/assignment-client/src/assets/AssetServer.cpp +++ b/assignment-client/src/assets/AssetServer.cpp @@ -63,13 +63,20 @@ void AssetServer::completeSetup() { const QJsonObject& settingsObject = domainHandler.getSettingsObject(); static const QString ASSET_SERVER_SETTINGS_KEY = "asset_server"; - auto assetServerObject = settingsObject[ASSET_SERVER_SETTINGS_KEY]; + + if (!settingsObject.contains(ASSET_SERVER_SETTINGS_KEY)) { + qCritical() << "Received settings from the domain-server with no asset-server section. Stopping assignment."; + setFinished(true); + return; + } + + auto assetServerObject = settingsObject[ASSET_SERVER_SETTINGS_KEY].toObject(); // get the path to the asset folder from the domain server settings static const QString ASSETS_PATH_OPTION = "assets_path"; - auto assetsJSONValue = assetServerObject.toObject()[ASSETS_PATH_OPTION]; + auto assetsJSONValue = assetServerObject[ASSETS_PATH_OPTION]; - if (assetsJSONValue.type() != QJsonValue::String) { + if (!assetsJSONValue.isString()) { qCritical() << "Received an assets path from the domain-server that could not be parsed. Stopping assignment."; setFinished(true); return;