aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2015-03-20 09:30:29 +1300
committerAldo Cortesi <aldo@nullcube.com>2015-03-20 09:30:29 +1300
commitd7e53e6573426c40ac7cfbaa7754380985227eb1 (patch)
treed6c97f3426a83abf2d415fc20a922b2327eb7011
parent97c6d7ed25e026ae8d5511550df9718f829a7f1e (diff)
downloadmitmproxy-d7e53e6573426c40ac7cfbaa7754380985227eb1.tar.gz
mitmproxy-d7e53e6573426c40ac7cfbaa7754380985227eb1.tar.bz2
mitmproxy-d7e53e6573426c40ac7cfbaa7754380985227eb1.zip
Fix crashes on mouse click when input is being handled
-rw-r--r--libmproxy/console/__init__.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py
index 198b7bbe..70b82d1d 100644
--- a/libmproxy/console/__init__.py
+++ b/libmproxy/console/__init__.py
@@ -617,8 +617,6 @@ class ConsoleMaster(flow.FlowMaster):
self.prompt_execute(k)
elif k == "enter":
self.prompt_execute()
- else:
- self.view.keypress(self.loop.screen_size, k)
else:
k = self.view.keypress(self.loop.screen_size, k)
if k:
@@ -943,7 +941,7 @@ class ConsoleMaster(flow.FlowMaster):
mkup.append(",")
prompt.extend(mkup)
prompt.append(")? ")
- self.onekey = "".join(i[1] for i in keys)
+ self.onekey = set(i[1] for i in keys)
self.prompt(prompt, "", callback, *args)
def prompt_done(self):