From 5d56ff37783f55c1075e4730d693f8fbe2776f58 Mon Sep 17 00:00:00 2001 From: auria Date: Wed, 16 Mar 2011 15:39:46 +0000 Subject: [PATCH] Fixed crash by moving scene_node->setName AFTER checking that scene_node is not null git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7947 178a84e3-b1eb-0310-8ba1-8eac791a3b58 --- src/tracks/track.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/tracks/track.cpp b/src/tracks/track.cpp index 49753a9a8..4034edb92 100644 --- a/src/tracks/track.cpp +++ b/src/tracks/track.cpp @@ -865,16 +865,18 @@ void Track::createWater(const XMLNode &node) scene_node = irr_driver->addMesh(mesh); } -#ifdef DEBUG - std::string debug_name = model_name+"(water node)"; - scene_node->setName(debug_name.c_str()); -#endif if(!mesh || !scene_node) { fprintf(stderr, "Warning: Water model '%s' in '%s' not found, ignored.\n", node.getName().c_str(), model_name.c_str()); return; } + +#ifdef DEBUG + std::string debug_name = model_name+"(water node)"; + scene_node->setName(debug_name.c_str()); +#endif + mesh->grab(); m_all_meshes.push_back(mesh);