[tor-commits] [arm/release] fix: Don't revert quit confirmation if 'yes'

atagar at torproject.org atagar at torproject.org
Sun Jul 17 06:08:18 UTC 2011


commit 45adb1c8036ef0b89eb58606fc2c559b38c82a27
Author: Damian Johnson <atagar at torproject.org>
Date:   Wed May 4 19:10:56 2011 -0700

    fix: Don't revert quit confirmation if 'yes'
    
    Due to changes in pause functionality the message when confirming that you want
    to quit would be reverted, even when you answer 'yes' to shut arm down (just a
    brief flicker while quitting).
---
 src/cli/controller.py |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/cli/controller.py b/src/cli/controller.py
index 91c34df..512e5ba 100644
--- a/src/cli/controller.py
+++ b/src/cli/controller.py
@@ -808,7 +808,8 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode):
           quitConfirmed = confirmationKey in (ord('q'), ord('Q'))
           curses.halfdelay(REFRESH_RATE * 10)
           
-          panels["control"].setMsg(CTL_PAUSED if isPaused else CTL_HELP)
+          if not quitConfirmed:
+            panels["control"].setMsg(CTL_PAUSED if isPaused else CTL_HELP)
           setPauseState(panels, isPaused, page)
         finally:
           panel.CURSES_LOCK.release()





More information about the tor-commits mailing list