Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 02:23:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix check for string assets path

Browse source
This commit is contained in:
Stephen Birarda 2016-02-11 15:38:50 -08:00
parent 7c0b3953e4
commit f117bd5867
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
assignment-client/src/assets/AssetServer.cpp
View file

@ -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;