From 79b7487c8757b3d2c2a587f8129ad17cc99893e5 Mon Sep 17 00:00:00 2001
From: greye <greye@null.net>
Date: Tue, 7 Aug 2012 22:21:46 +0400
Subject: [PATCH] fix using deleted objects

---
 apps/openmw/mwworld/cellstore.hpp | 2 +-
 apps/openmw/mwworld/worldimp.cpp  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwworld/cellstore.hpp b/apps/openmw/mwworld/cellstore.hpp
index 0be0ef6516..8eafb6b10a 100644
--- a/apps/openmw/mwworld/cellstore.hpp
+++ b/apps/openmw/mwworld/cellstore.hpp
@@ -69,7 +69,7 @@ namespace MWWorld
     {
         for (typename std::list<LiveRef>::iterator iter (list.begin()); iter!=list.end(); ++iter)
         {
-            if (iter->ref.refID==name)
+            if (iter->mData.getCount() > 0 && iter->ref.refID == name)
                 return &*iter;
         }
 
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index dc7f25751d..748e6dc044 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -51,7 +51,7 @@ namespace
 
         for (iterator iter (refList.list.begin()); iter!=refList.list.end(); ++iter)
         {
-            if(iter->mData.getBaseNode()){
+            if(iter->mData.getCount() > 0 && iter->mData.getBaseNode()){
             if (iter->mData.getHandle()==handle)
             {
                 return &*iter;