[vidalia-svn] r1964: Only ask Tor for the value of some server setting if those s (in trunk: . src/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-10-02 23:34:24 -0400 (Tue, 02 Oct 2007)
New Revision: 1964

Modified:
   trunk/
   trunk/src/config/serversettings.cpp
Log:
 r1997@lysithea:  edmanm | 2007-10-02 23:24:26 -0400
 Only ask Tor for the value of some server setting if those settings have not
 changed since the last time they were applied. That is, values set by the user
 through Vidalia take precedence over values they set manually in their torrc.



Property changes on: trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r1997] on dc66be73-d13e-47ba-a267-8dc7cda68c65

Modified: trunk/src/config/serversettings.cpp
===================================================================
--- trunk/src/config/serversettings.cpp	2007-10-03 02:44:37 UTC (rev 1963)
+++ trunk/src/config/serversettings.cpp	2007-10-03 03:34:24 UTC (rev 1964)
@@ -166,7 +166,7 @@
   QVariant value;
   QString confKey, confValue;
   confKey = key.mid(key.indexOf("/")+1);
-  if (_torControl->isConnected()) {
+  if (_torControl->isConnected() && !changedSinceLastApply()) {
     quint32 torVersion = _torControl->getTorVersion();
     if (torVersion >= 0x020001) {
       if (confKey == SERVER_BANDWIDTH_RATE)