Commit 8cace7ea authored by Matt Edman's avatar Matt Edman
Browse files

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.


svn:r1748
parent 0cd857b1

doc/TODO

+0 −5
Changes for doc/TODO: 0 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -80,11 +80,6 @@ Miscellaneous Tasks: 




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.

src/config/serversettings.cpp

+1 −3
Changes for src/config/serversettings.cpp: 1 added line, 3 removed lines.
Original line number Diff line number Diff line
@@ -264,9 +264,7 @@ ServerSettings::apply(QString *errmsg) 
    rc = _torControl->resetConf(resetKeys, errmsg);

  }

  if (rc) {

    if (!_torControl->saveConf(errmsg)) {

      return false;

    }

    if (_torControl->saveConf(errmsg))

      setChanged(false);

    _backupSettings = allSettings();

  }