aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/console
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-09-04 14:18:21 +0200
committerMaximilian Hils <git@maximilianhils.com>2014-09-04 14:18:21 +0200
commit1d45c54a045ba8481cb907e292fde9a52c26dba1 (patch)
treed5b109b9648986a3bd3a0a12aa5ab12471cb15f9 /libmproxy/console
parentea55f2e0122352934aa98fc1ea41230b280d5915 (diff)
parent1135666ee6fb145491eb6d07435eb0cf58b2094f (diff)
downloadmitmproxy-1d45c54a045ba8481cb907e292fde9a52c26dba1.tar.gz
mitmproxy-1d45c54a045ba8481cb907e292fde9a52c26dba1.tar.bz2
mitmproxy-1d45c54a045ba8481cb907e292fde9a52c26dba1.zip
Merge branch 'issue_341' into server_change_api
Diffstat (limited to 'libmproxy/console')
-rw-r--r--libmproxy/console/__init__.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py
index a5920915..ca395ed9 100644
--- a/libmproxy/console/__init__.py
+++ b/libmproxy/console/__init__.py
@@ -599,6 +599,8 @@ class ConsoleMaster(flow.FlowMaster):
try:
self.ui.run_wrapper(self.loop)
except Exception:
+ self.ui.stop()
+ sys.stdout.flush()
print >> sys.stderr, traceback.format_exc()
print >> sys.stderr, "mitmproxy has crashed!"
print >> sys.stderr, "Please lodge a bug report at: https://github.com/mitmproxy/mitmproxy"