Make CPEClientServices destructor more resilient (Bug 3706)
authorWilliam Roberts <williamr@symbian.org>
Wed, 15 Sep 2010 17:56:16 +0100
changeset 68 82f96d64ae88
parent 67 f6dff55cb5cd
Make CPEClientServices destructor more resilient (Bug 3706)
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();  
     }