diff -r df4dfb214df5 -r 8c9c07ad8b6b convergedconnectionhandler/cchserver/src/cchconnmonhandler.cpp --- a/convergedconnectionhandler/cchserver/src/cchconnmonhandler.cpp Wed Jun 09 09:31:04 2010 +0300 +++ b/convergedconnectionhandler/cchserver/src/cchconnmonhandler.cpp Mon Jun 21 15:29:21 2010 +0300 @@ -105,12 +105,15 @@ CCCHConnMonHandler::~CCCHConnMonHandler() { CCHLOGSTRING( "CCCHConnMonHandler::~CCCHConnMonHandler" ); - iConnChangeListenerTimer->Cancel(); + if ( iConnChangeListenerTimer ) + { + iConnChangeListenerTimer->Cancel(); + } delete iConnChangeListenerTimer; StopNotify(); Cancel(); iPendingRequests.Close(); - iUnsolvedConnIds.Close(); + iUnsolvedConnIds.Close(); iConnIapIds.Close(); iAvailableSNAPs.Close(); iAvailableIAPs.Close(); @@ -177,6 +180,7 @@ MCCHConnMonHandlerNotifier* aObserver ) { CCHLOGSTRING( "CCCHConnMonHandler::SetSNAPsAvailabilityChangeListener" ); + iConnChangeListenerTimer->Cancel(); iSNAPsAvailabilityObserver = aObserver; if ( iSNAPsAvailabilityObserver ) { @@ -564,6 +568,7 @@ } if ( iSNAPsAvailabilityObserver ) { + iConnChangeListenerTimer->Cancel(); iSNAPsAvailabilityObserver->SNAPsAvailabilityChanged( KErrCancel ); iSNAPsAvailabilityObserver = NULL; }