fix two bugs with proxy settings

haiwen · Mar 19, 2015 · d64353d · d64353d
1 parent 61344ec
commit d64353d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/settings-mgr.cpp b/src/settings-mgr.cpp
@@ -372,7 +372,7 @@ void SettingsManager::setProxy(SettingsManager::ProxyType proxy_type, const QStr
             return;
     }
     // skip invalid port
-    if (proxy_type == HttpProxy && proxy_port_ == 0)
+    if (proxy_type == HttpProxy && proxy_port == 0)
         proxy_port = 80;
     if (proxy_port == 0)
         return;

diff --git a/src/ui/settings-dialog.cpp b/src/ui/settings-dialog.cpp
@@ -282,6 +282,7 @@ bool SettingsDialog::updateProxySettings()
 
     switch(proxy_type) {
         case SettingsManager::HttpProxy:
+                // if we setup proxy username now and previously
             if (mProxyRequirePassword->checkState() == Qt::Checked) {
                 if (proxy_type == old_proxy_type &&
                     proxy_host == old_proxy_host &&
@@ -296,9 +297,11 @@ bool SettingsDialog::updateProxySettings()
                 break;
             }
             else {
+                // and if we don't setup proxy username now and previously
                 if (proxy_type == old_proxy_type &&
                     proxy_host == old_proxy_host &&
-                    proxy_port == old_proxy_port)
+                    proxy_port == old_proxy_port &&
+                    old_proxy_username.isEmpty())
                     break;
                 proxy_changed = true;
                 mgr->setProxy(SettingsManager::HttpProxy,