[vidalia-svn] r1748: Don't yell at the user if our SAVECONF fails; just remember (in trunk: doc src/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-05-20 21:45:35 -0400 (Sun, 20 May 2007)
New Revision: 1748

Modified:
   trunk/doc/TODO
   trunk/src/config/serversettings.cpp
Log:
Don't yell at the user if our SAVECONF fails; just remember the settings we
tried to save and then SETCONF them again next time Tor runs.


Modified: trunk/doc/TODO
===================================================================
--- trunk/doc/TODO	2007-05-18 13:57:14 UTC (rev 1747)
+++ trunk/doc/TODO	2007-05-21 01:45:35 UTC (rev 1748)
@@ -80,11 +80,6 @@
 
 
 Notes from Roger:
-  * I mentioned today that it would be smart if Vidalia recognized when
-    Tor refuses to write its config file because of permissions, and did
-    something smarter -- like handling the error and remembering the intended
-    changes itself, or like rephrasing the error to give some hints about
-    what's going on.
   * 17:53 < arma> does vidalia have a fascistfirewall button?
     17:53 < edmanm> it does not. should it?
     17:57 < arma> at some point, it should.

Modified: trunk/src/config/serversettings.cpp
===================================================================
--- trunk/src/config/serversettings.cpp	2007-05-18 13:57:14 UTC (rev 1747)
+++ trunk/src/config/serversettings.cpp	2007-05-21 01:45:35 UTC (rev 1748)
@@ -264,10 +264,8 @@
     rc = _torControl->resetConf(resetKeys, errmsg);
   }
   if (rc) {
-    if (!_torControl->saveConf(errmsg)) {
-      return false;
-    }
-    setChanged(false);
+    if (_torControl->saveConf(errmsg))
+      setChanged(false);
     _backupSettings = allSettings();
   }
   return rc;