diff -r 63c982fb92f2 -r b73252188534 harvester/common/src/harvestereventmanager.cpp --- a/harvester/common/src/harvestereventmanager.cpp Thu Jul 15 19:07:24 2010 +0300 +++ b/harvester/common/src/harvestereventmanager.cpp Thu Aug 19 10:20:41 2010 +0300 @@ -93,6 +93,7 @@ { // destroy the singleton and free TLS delete data; + data = NULL; UserSvr::DllFreeTls( KHarvesterEventManagerTLSKey ); } } @@ -439,6 +440,7 @@ iRegisteredObservers.Remove( i ); delete observer; + observer = NULL; } // Find if any other observer is using the same queue else @@ -468,6 +470,7 @@ iEventQueues.Remove( mid ); queue->Close(); delete queue; + queue = NULL; break; } else if( compare > 0 )