From 8445c5ede7f5b48f5074d2754abcc14b85196f39 Mon Sep 17 00:00:00 2001
From: Xizhi Zhu <xizhi.zhu@nokia.com>
Date: Thu, 22 Mar 2012 11:25:51 +0100
Subject: 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>
---
 src/network/kernel/qnetworkproxy.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

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;
-- 
cgit v1.2.3