--- a/localconnectivityservice/obexserviceman/utils/src/obexutilsdialog.cpp Mon Jan 18 21:03:15 2010 +0200
+++ b/localconnectivityservice/obexserviceman/utils/src/obexutilsdialog.cpp Fri Apr 23 23:16:31 2010 +0300
@@ -99,9 +99,7 @@
FLOG(_L("[OBEXUTILS]\t CObexUtilsDialog::~CObexUtilsDialog()"));
CCoeEnv::Static()->DeleteResourceFile( iResourceFileId );
- delete iProgressDialog;
delete iObexDialogTimer;
- delete iWaitDialog;
FLOG(_L("[OBEXUTILS]\t CObexUtilsDialog::~CObexUtilsDialog() completed"));
}
@@ -168,7 +166,8 @@
}
iWaitDialog = new( ELeave ) CAknWaitDialog(
- ( reinterpret_cast<CEikDialog**>( &iWaitDialog ) ), ETrue );
+ ( reinterpret_cast<CEikDialog**>( &iWaitDialog ) ), EFalse );
+
iWaitDialog->SetCallback( this );
PrepareDialogExecuteL( aResId, iWaitDialog );
iWaitDialog->ExecuteLD( aResId );
@@ -185,7 +184,9 @@
if( iWaitDialog )
{
+ iWaitDialog->SetCallback(NULL);
iWaitDialog->ProcessFinishedL();
+ iWaitDialog = NULL;
}
FLOG(_L("[OBEXUTILS]\t CObexUtilsDialog::CancelWaitDialogL() completed"));