# HG changeset patch # User Shabe Razvi # Date 1284569776 -3600 # Node ID 949d9e5675bfc1a52772082a9a092d7b92a0b81b # Parent d1c62c765e4856a1cb5f5982e6401f9feee141c2 Make CPEClientServices destructor more resilient (Bug 3706) diff -r d1c62c765e48 -r 949d9e5675bf phoneengine/phonemodel/src/cpeclientservices.cpp --- a/phoneengine/phonemodel/src/cpeclientservices.cpp Fri Sep 17 17:09:12 2010 +0300 +++ 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(); }