diff -r 5210ffae7137 -r 910a23996aa0 harvester/common/src/harvestermediaidutil.cpp --- a/harvester/common/src/harvestermediaidutil.cpp Wed Jul 14 07:57:22 2010 +0300 +++ b/harvester/common/src/harvestermediaidutil.cpp Fri Jul 23 10:03:59 2010 +0300 @@ -136,8 +136,10 @@ if (data->iRefCount <= 0) { delete data->iMediaIdUtil; + data->iMediaIdUtil = NULL; delete data; + data = NULL; UserSvr::DllFreeTls(KHarvesterMediaIdTLSKey); } }