summaryrefslogtreecommitdiff
path: root/src/itemdef.cpp
diff options
context:
space:
mode:
authorWeblate <42@minetest.ru>2013-05-01 15:33:15 +0200
committerWeblate <42@minetest.ru>2013-05-01 15:33:15 +0200
commit97cddd1b960e3b60ce74ff9ad16307b39676144e (patch)
tree0547ab284acc0fdf8aad2a36643be6f78f786ef1 /src/itemdef.cpp
parentf1f2004cb9efb026625b192b404064c26ceb6d5f (diff)
parent898a4e441fc0245aaf4821ff5e3dad0daccda3b5 (diff)
downloadminetest-97cddd1b960e3b60ce74ff9ad16307b39676144e.tar.gz
minetest-97cddd1b960e3b60ce74ff9ad16307b39676144e.tar.bz2
minetest-97cddd1b960e3b60ce74ff9ad16307b39676144e.zip
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/itemdef.cpp')
-rw-r--r--src/itemdef.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/itemdef.cpp b/src/itemdef.cpp
index 784919ae2..05328ea48 100644
--- a/src/itemdef.cpp
+++ b/src/itemdef.cpp
@@ -247,7 +247,8 @@ public:
i = values.begin(); i != values.end(); ++i)
{
ClientCached *cc = *i;
- cc->wield_mesh->drop();
+ if (cc->wield_mesh)
+ cc->wield_mesh->drop();
delete cc;
}