From cff35cf0b328635b2c77c024343f8e7f2d016990 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Fri, 12 Mar 2021 19:30:56 +0100 Subject: Handle mesh load failure without crashing --- src/client/client.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/client/client.cpp b/src/client/client.cpp index ef4a3cdfc..746c6c080 100644 --- a/src/client/client.cpp +++ b/src/client/client.cpp @@ -1921,6 +1921,8 @@ scene::IAnimatedMesh* Client::getMesh(const std::string &filename, bool cache) scene::IAnimatedMesh *mesh = RenderingEngine::get_scene_manager()->getMesh(rfile); rfile->drop(); + if (!mesh) + return nullptr; mesh->grab(); if (!cache) RenderingEngine::get_mesh_cache()->removeMesh(mesh); -- cgit v1.2.3