[vidalia-svn] r2026: If we can't getconf a value, return the 'local' value instea (in trunk: . src/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-10-13 20:26:59 -0400 (Sat, 13 Oct 2007)
New Revision: 2026

Modified:
   trunk/
   trunk/src/config/abstracttorsettings.cpp
Log:
 r2113@lysithea:  edmanm | 2007-10-13 20:16:37 -0400
 If we can't getconf a value, return the 'local' value instead of assuming
 the default.



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

Modified: trunk/src/config/abstracttorsettings.cpp
===================================================================
--- trunk/src/config/abstracttorsettings.cpp	2007-10-13 07:12:19 UTC (rev 2025)
+++ trunk/src/config/abstracttorsettings.cpp	2007-10-14 00:26:59 UTC (rev 2026)
@@ -114,7 +114,7 @@
     value.setValue(confValue);
     value.convert(defaultVal.type());
   }
-  return (isEmptyValue(value) ? defaultVal : value);
+  return (isEmptyValue(value) ? localValue(key) : value);
 }
 
 /** If Vidalia is connected to Tor, this returns the value associated with