networkcontrol/ipnetworklayer/src/ipprotodeftscpr.cpp
changeset 51 78fceed50f62
parent 0 af10295192d8
child 60 d69860d28da4
--- a/networkcontrol/ipnetworklayer/src/ipprotodeftscpr.cpp	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkcontrol/ipnetworklayer/src/ipprotodeftscpr.cpp	Wed Aug 18 11:18:20 2010 +0300
@@ -23,7 +23,7 @@
 
 #include <comms-infras/corescprstates.h>
 #include <comms-infras/corescpractivities.h>
-#include "ipprotocprstates.h"
+#include "IPProtoCprStates.h"
 
 #include "ipprotodeftscpr.h"
 #include "ipprotodeftscprstates.h"
@@ -164,7 +164,8 @@
 	 ALegacySubConnectionActiveApiExt(this),
 	 TIfStaticFetcherNearestInHierarchy(this),
 	 iNotify(NULL),
-	 iControl(NULL)
+	 iControl(NULL),
+	 iNetworkConfigurationState(EFalse)
     {
     LOG_NODE_CREATE(KIPProtoDeftScprTag, CIPProtoDeftSubConnectionProvider);
     }
@@ -195,10 +196,21 @@
 
 CIPProtoDeftSubConnectionProvider::~CIPProtoDeftSubConnectionProvider()
     {
+   if(iNetworkConfigurationState == EFalse)
+       {
+       if(iNotify)
+           {
+           delete iNotify;
+           iNotify = NULL;
+           }
+       }
 	if (iControl)
 		delete iControl;
 	if (iNotify)
+	    {
 		delete iNotify;
+		iNotify = NULL;
+		}
 
     LOG_NODE_DESTROY(KIPProtoDeftScprTag, CIPProtoDeftSubConnectionProvider);
     }