# HG changeset patch # User William Roberts # Date 1284569776 -3600 # Node ID 82f96d64ae88f1189473e90442ac2ad43b4bbcd1 # Parent f6dff55cb5cd4c093c056e2693efec8576f7ba6e Make CPEClientServices destructor more resilient (Bug 3706) diff -r f6dff55cb5cd -r 82f96d64ae88 phoneengine/phonemodel/src/cpeclientservices.cpp --- a/phoneengine/phonemodel/src/cpeclientservices.cpp Tue Sep 14 17:18:52 2010 +0100 +++ b/phoneengine/phonemodel/src/cpeclientservices.cpp Wed Sep 15 17:56:16 2010 +0100 @@ -134,11 +134,14 @@ if ( iUssdClient ) { iUssdClient->SendUssdCancel(); + delete iUssdClient; } - delete iUssdClient; delete iClientEmergencyMonitor; - iCallNotifier->Close(); - delete iCallNotifier; + if ( iCallNotifier ) + { + iCallNotifier->Close(); + delete iCallNotifier; + } delete iEmergency; iPhoneServer.Close(); }