diff -r c3e98f10fcf4 -r c4f07256ff37 localconnectivityservice/obexsendservices/obexservicesendutils/src/BTSBPPController.cpp --- a/localconnectivityservice/obexsendservices/obexservicesendutils/src/BTSBPPController.cpp Mon Jan 18 21:03:15 2010 +0200 +++ b/localconnectivityservice/obexsendservices/obexservicesendutils/src/BTSBPPController.cpp Fri Apr 23 23:16:31 2010 +0300 @@ -109,9 +109,16 @@ // Destructor CBTSBPPController::~CBTSBPPController() { - delete iClient; - delete iServer; - delete iServerWait; + if ( iServer ) + { + delete iServer; + iServer = NULL; + } + if ( iServerWait ) + { + delete iServerWait; + iServerWait = NULL; + } } @@ -311,8 +318,11 @@ // For some reason the printer didn't establish server connection although // there were referenced objects // - delete iServerWait; - iServerWait = NULL; + if ( iServerWait ) + { + delete iServerWait; + iServerWait = NULL; + } // The client was waiting for server, but now another object // can be sent.