From f9e88fb40c847e130424a60a7af40980ed030ea3 Mon Sep 17 00:00:00 2001 From: Kalle Bladin Date: Thu, 15 Sep 2016 12:49:34 -0400 Subject: [PATCH] Fix bug that caused black screen when unable to load gdal dataset. --- .../globebrowsing/tile/tileprovidermanager.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/modules/globebrowsing/tile/tileprovidermanager.cpp b/modules/globebrowsing/tile/tileprovidermanager.cpp index 600e531d9c..c395398074 100644 --- a/modules/globebrowsing/tile/tileprovidermanager.cpp +++ b/modules/globebrowsing/tile/tileprovidermanager.cpp @@ -133,11 +133,20 @@ namespace openspace { std::string type = "LRUCaching"; // if type is unspecified texDict.getValue("Type", type); - + TileProvider* tileProvider; auto tileProviderFactory = FactoryManager::ref().factory(); - TileProvider* tileProvider = tileProviderFactory->create(type, texDict); + try { + tileProvider = tileProviderFactory->create(type, texDict); + } + catch (const ghoul::RuntimeError& e) { + LERROR(e.what()); + continue; + } + + // Something else went wrong and no exception was thrown if (tileProvider == nullptr) { - LERROR("Unable to create TileProvider '" << name << "' of type '" << type << "'"); + LERROR("Unable to create TileProvider '" << name << "' of type '" + << type << "'"); continue; }