summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
authorXizhi Zhu <xizhi.zhu@nokia.com>2012-03-22 11:25:51 +0100
committerQt by Nokia <qt-info@nokia.com>2012-03-22 13:28:32 +0100
commit8445c5ede7f5b48f5074d2754abcc14b85196f39 (patch)
tree416f01cb2ada4159a46503deb20f7d7da88d8d2c /src/network
parent89b5244310d6765f6afd61ea5bd4acc2aed34c3b (diff)
Don't do anything if setting the same proxy factory.
Otherwise, it crashes if you simply set the same proxy factory instance twice. Change-Id: I4b1f1d0eed7630c9a145c0a330c6be1b3fc381e5 Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
Diffstat (limited to 'src/network')
-rw-r--r--src/network/kernel/qnetworkproxy.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp
index 8d30e81c3b..501afce6fc 100644
--- a/src/network/kernel/qnetworkproxy.cpp
+++ b/src/network/kernel/qnetworkproxy.cpp
@@ -278,6 +278,8 @@ public:
void setApplicationProxyFactory(QNetworkProxyFactory *factory)
{
QMutexLocker lock(&mutex);
+ if (factory == applicationLevelProxyFactory)
+ return;
if (applicationLevelProxy)
*applicationLevelProxy = QNetworkProxy();
delete applicationLevelProxyFactory;