diff --git a/modules/iswa/rendering/datasphere.cpp b/modules/iswa/rendering/datasphere.cpp index 1d7b1bdc41..8e3f570f51 100644 --- a/modules/iswa/rendering/datasphere.cpp +++ b/modules/iswa/rendering/datasphere.cpp @@ -118,7 +118,7 @@ bool DataSphere::loadTexture(){ if(_futureObject.valid() && DownloadManager::futureReady(_futureObject)){ DownloadManager::MemoryFile dataFile = _futureObject.get(); - if(dataFile.corrupted) + if(dataFile.corrupted) return false; _dataBuffer = ""; diff --git a/modules/iswa/util/iswamanager.cpp b/modules/iswa/util/iswamanager.cpp index c7eaee1df6..a29a817c92 100644 --- a/modules/iswa/util/iswamanager.cpp +++ b/modules/iswa/util/iswamanager.cpp @@ -421,18 +421,18 @@ void IswaManager::fillCygnetInfo(std::string jsonString){ for(auto list : lists){ json jsonList = j[list]; for(int i=0; i(info); + CygnetInfo info = { + name, + jCygnet["cygnetDescription"], + jCygnet["cygnetUpdateInterval"], + false + }; + _cygnetInformation[jCygnet["cygnetID"]] = std::make_shared(info); } } } diff --git a/src/engine/downloadmanager.cpp b/src/engine/downloadmanager.cpp index b7f4baa85a..af787865cb 100644 --- a/src/engine/downloadmanager.cpp +++ b/src/engine/downloadmanager.cpp @@ -300,6 +300,8 @@ std::future DownloadManager::fetchFile( curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *)&file); curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, writeMemoryCallback); curl_easy_setopt(curl, CURLOPT_TIMEOUT, 5L); + // Will fail when response status is 400 or above + curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1L); CURLcode res = curl_easy_perform(curl); if(res == CURLE_OK){