--- a/src/hbwidgets/devicedialogs/hbdeviceprogressdialogsymbian.cpp	Tue Jul 06 14:36:53 2010 +0300
+++ b/src/hbwidgets/devicedialogs/hbdeviceprogressdialogsymbian.cpp	Wed Aug 18 10:05:37 2010 +0300
@@ -153,7 +153,7 @@
         iButton.iFlags.iIsNullModified = false;
         HBufC *actionData = CreateActionDataLC(iButton.iFlags.iIsNull, iButton.iText);
         AddVariantL(KCancelAction, actionData, CHbSymbianVariant::EDes, iVariantMap);
-        CleanupStack::PopAndDestroy(); // actionData
+        CleanupStack::PopAndDestroy(actionData);
         }
     iButton.iFlags.iPressed = false;
     TInt error = iDeviceDialog->Show(KPluginIdentifier, *iVariantMap, this);
@@ -171,6 +171,7 @@
 void CHbDeviceProgressDialogSymbianPrivate::UpdateL()
     {
     CHbSymbianVariantMap* map = CHbSymbianVariantMap::NewL();
+    CleanupStack::PushL(map);
 
     const CHbSymbianVariant* variant = Variant(KDialogMaximum);
     if (variant && *variant->Value<TInt>() != iMaximum)
@@ -234,11 +235,12 @@
         iButton.iFlags.iIsNullModified = false;
         HBufC *actionData = CreateActionDataLC(iButton.iFlags.iIsNull, iButton.iText);
         AddVariantL(KCancelAction, actionData, CHbSymbianVariant::EDes, iVariantMap);
-        CleanupStack::PopAndDestroy(); // actionData
+        CleanupStack::PopAndDestroy(actionData);
         }
 
     TInt error = iDeviceDialog->Update(*map);
-    delete map; map = 0;
+    CleanupStack::PopAndDestroy(map);
+    map = 0;
     if (error != KErrNone) {
         User::Leave(error); // error can be positive or negative
     }