summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@nokia.com>2010-07-26 02:02:36 (GMT)
committerToby Tomkins <toby.tomkins@nokia.com>2010-07-29 03:37:50 (GMT)
commitab394977cfc525b49f84013ded4f4c5162e104b3 (patch)
tree237cc65cf023ac5960a98cc66b6d82819757396b
parent21629ac069349f29ec9e329f96934dbdd3a84745 (diff)
downloadQt-ab394977cfc525b49f84013ded4f4c5162e104b3.zip
Qt-ab394977cfc525b49f84013ded4f4c5162e104b3.tar.gz
Qt-ab394977cfc525b49f84013ded4f4c5162e104b3.tar.bz2
Cherry pick fix for MOBILITY-1145 from Qt Mobility.
f17d8a5dbef076046ff504fecb1fd445c9b785ac (cherry picked from commit 0664d3ad029b4d80d9ffac75f4f1c6c47bac2641)
-rw-r--r--src/plugins/bearer/symbian/qnetworksession_impl.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/bearer/symbian/qnetworksession_impl.cpp b/src/plugins/bearer/symbian/qnetworksession_impl.cpp
index 99737d7..d6b4975 100644
--- a/src/plugins/bearer/symbian/qnetworksession_impl.cpp
+++ b/src/plugins/bearer/symbian/qnetworksession_impl.cpp
@@ -1130,7 +1130,9 @@ void QNetworkSessionPrivateImpl::RunL()
isOpening = false;
activeConfig = QNetworkConfiguration();
serviceConfig = QNetworkConfiguration();
- if (publicConfig.state() == QNetworkConfiguration::Undefined ||
+ if (statusCode == KErrCancel) {
+ iError = QNetworkSession::SessionAbortedError;
+ } else if (publicConfig.state() == QNetworkConfiguration::Undefined ||
publicConfig.state() == QNetworkConfiguration::Defined) {
iError = QNetworkSession::InvalidConfigurationError;
} else {