[tor-commits] [arm/release] fix: Selecting 'auto' resolver gave stacktrace

[atagar@xxxxxxxxxxxxxx]

commit a3c839db116c757fbad03c82b35688ca60f0be0f
Author: Damian Johnson <atagar@xxxxxxxxxxxxxx>
Date:   Wed Apr 27 08:24:03 2011 -0700

    fix: Selecting 'auto' resolver gave stacktrace
    
    A previous change caused a bug where, when selecting 'auto' from the resolver
    dropdown menu, resolutions produced a stack trace due to a bad key. This
    doesn't crash arm, but is clearly broken.
---
 src/cli/controller.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/cli/controller.py b/src/cli/controller.py
index 2afbf6a..22d1772 100644
--- a/src/cli/controller.py
+++ b/src/cli/controller.py
@@ -1250,7 +1250,7 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode):
       setPauseState(panels, isPaused, page, True)
       
       selection = showMenu(stdscr, panels["popup"], "Resolver Util:", options, initialSelection)
-      selectedOption = options[selection] if selection != "auto" else None
+      selectedOption = options[selection] if selection != 0 else None
       
       # reverts changes made for popup
       panels["conn"]._title = panelTitle



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits