src/hbwidgets/devicedialogs/hbdeviceprogressdialogsymbian.cpp
branchGCC_SURGE
changeset 15 f378acbc9cfb
parent 5 627c4a0fd0e7
child 21 4633027730f5
child 34 ed14f46c0e55
--- a/src/hbwidgets/devicedialogs/hbdeviceprogressdialogsymbian.cpp	Thu Jul 15 14:03:49 2010 +0100
+++ b/src/hbwidgets/devicedialogs/hbdeviceprogressdialogsymbian.cpp	Thu Jul 22 16:36:53 2010 +0100
@@ -156,8 +156,10 @@
         CleanupStack::PopAndDestroy(); // actionData
         }
     iButton.iFlags.iPressed = false;
-    User::LeaveIfError(iDeviceDialog->Show(KPluginIdentifier, *iVariantMap, this));
-
+    TInt error = iDeviceDialog->Show(KPluginIdentifier, *iVariantMap, this);
+    if (error != KErrNone) {
+        User::Leave(error); // error can be positive or negative
+    }
     iVisible = ETrue;
     }
 
@@ -235,9 +237,11 @@
         CleanupStack::PopAndDestroy(); // actionData
         }
 
-    User::LeaveIfError(iDeviceDialog->Update(*map));
-    delete map;
-    map = 0;
+    TInt error = iDeviceDialog->Update(*map);
+    delete map; map = 0;
+    if (error != KErrNone) {
+        User::Leave(error); // error can be positive or negative
+    }
     }
 
 void CHbDeviceProgressDialogSymbianPrivate::DataReceived(CHbSymbianVariantMap& aData)