commit b00f51dc295bcd84420c57351bdcb4b822cd353e Author: Tomás Touceda chiiph@torproject.org Date: Sat Aug 11 19:27:44 2012 -0300

Improve router loading --- changes/bug6482 | 4 ++++ src/vidalia/network/NetViewer.cpp | 7 +++++++ 2 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/changes/bug6482 b/changes/bug6482 new file mode 100644 index 0000000..e276064 --- /dev/null +++ b/changes/bug6482 @@ -0,0 +1,4 @@ + o Do not wait too much to try reloading the router list if the ns/all command + returned empty. Fixes bug 6483. + o Stop trying to load router information if torControl is not connected + anymore. Fixes bug 6482. diff --git a/src/vidalia/network/NetViewer.cpp b/src/vidalia/network/NetViewer.cpp index 1d48b96..d9782ff 100644 --- a/src/vidalia/network/NetViewer.cpp +++ b/src/vidalia/network/NetViewer.cpp @@ -312,12 +312,19 @@ void NetViewer::loadNetworkStatus() { NetworkStatus networkStatus = _torControl->getNetworkStatus(); + if (networkStatus.isEmpty()) { + _refreshTimer.setInterval(2000); + } else { + _refreshTimer.setInterval(60*60*1000); + }

bool usingMicrodescriptors = _torControl->useMicrodescriptors();

foreach(RouterStatus rs, networkStatus) { if (!rs.isRunning()) continue; + if (not _torControl->isConnected()) + return;

RouterDescriptor rd = _torControl->getRouterDescriptor(rs.id()); if(usingMicrodescriptors) {