[tor-commits] [nyx/master] Pressing 'esc' when changing config values set them to 'none'

[atagar at torproject.org]

commit 15d0c641613b14345c9b4e993a3e0f8cadd0afc5
Author: Damian Johnson <atagar at torproject.org>
Date:   Tue Jan 8 09:34:57 2019 -0800

    Pressing 'esc' when changing config values set them to 'none'
    
    Yikes, surprised I let this one slip in. When pressing 'esc' on the
    configuration editor if the configuration option already had a value
    then it was changed to 'None'. Definitely not what users would
    rightfully expect...
    
      https://trac.torproject.org/projects/tor/ticket/28334
---
 nyx/panel/config.py      | 2 +-
 web/changelog/index.html | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/nyx/panel/config.py b/nyx/panel/config.py
index 23d7601..e1eb19c 100644
--- a/nyx/panel/config.py
+++ b/nyx/panel/config.py
@@ -238,7 +238,7 @@ class ConfigPanel(nyx.panel.Panel):
       initial_value = selected.value() if selected.is_set() else ''
       new_value = input_prompt('%s Value (esc to cancel): ' % selected.name, initial_value)
 
-      if new_value != initial_value:
+      if new_value is not None and new_value != initial_value:
         try:
           if selected.value_type == 'Boolean':
             # if the value's a boolean then allow for 'true' and 'false' inputs
diff --git a/web/changelog/index.html b/web/changelog/index.html
index 1700466..241f788 100644
--- a/web/changelog/index.html
+++ b/web/changelog/index.html
@@ -110,6 +110,7 @@
           <ul>
             <li>New tor configuration options crashed nyx when shown (<b><a href="https://trac.torproject.org/projects/tor/ticket/24401">ticket</a></b>)</li>
             <li>Errors when saving the configuration could result in a stacktrace (<b><a href="https://trac.torproject.org/projects/tor/ticket/24409">ticket</a></b>)</li>
+            <li>Pressing 'esc' when editing values changed their value to 'none' (<b><a href="https://trac.torproject.org/projects/tor/ticket/28334">ticket</a></b>)</li>
           </ul>
         </li>