Merge pull request #370 from Nyfor/fix-segfault-on-close

Fix segfault on shutdown.
This commit is contained in:
Cyril Soler 2016-05-05 09:45:22 -04:00
commit ad2df86ab3

View File

@ -279,10 +279,6 @@ void *SmallObject::operator new(size_t size)
#endif #endif
RsStackMutex m(_mtx) ; RsStackMutex m(_mtx) ;
if(!_allocator._active)
return (void*)NULL;
void *p = _allocator.allocate(size) ; void *p = _allocator.allocate(size) ;
#ifdef DEBUG_MEMORY #ifdef DEBUG_MEMORY
std::cerr << "new RsItem: " << p << ", size=" << size << std::endl; std::cerr << "new RsItem: " << p << ", size=" << size << std::endl;