EntityModelManager::renderer: catch exceptions thrown by model() (#1531)

Fixes #1525
TrenchBroom · Dec 7, 2016 · 399226c · 399226c
1 parent 72bbf85
commit 399226c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/common/src/Assets/EntityModelManager.cpp b/common/src/Assets/EntityModelManager.cpp
@@ -93,8 +93,17 @@ namespace TrenchBroom {
             }
         }
 
+        EntityModel* EntityModelManager::safeGetModel(const IO::Path& path) const {
+            try {
+                return model(path);
+            } catch (const GameException&) {
+                return NULL;
+            }
+        }
+
         Renderer::TexturedIndexRangeRenderer* EntityModelManager::renderer(const Assets::ModelSpecification& spec) const {
-            EntityModel* entityModel = model(spec.path);
+            EntityModel* entityModel = safeGetModel(spec.path);
+
             if (entityModel == NULL)
                 return NULL;
 

diff --git a/common/src/Assets/EntityModelManager.h b/common/src/Assets/EntityModelManager.h
@@ -77,6 +77,7 @@ namespace TrenchBroom {
             void setLoader(const IO::EntityModelLoader* loader);
 
             EntityModel* model(const IO::Path& path) const;
+            EntityModel* safeGetModel(const IO::Path& path) const;
             Renderer::TexturedIndexRangeRenderer* renderer(const Assets::ModelSpecification& spec) const;
 
             bool hasModel(const Model::Entity* entity) const;