aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/console/__init__.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-09-04 14:18:07 +0200
committerMaximilian Hils <git@maximilianhils.com>2014-09-04 14:18:07 +0200
commit1135666ee6fb145491eb6d07435eb0cf58b2094f (patch)
tree843fbfe8c708d8b260ea74fe7d98b3bad4bd1c6f /libmproxy/console/__init__.py
parent649e63ff3c868397f493e1dabdc1c63d572aedd8 (diff)
parent39fa579dd564823171f804c4307ab93db4d3b961 (diff)
downloadmitmproxy-1135666ee6fb145491eb6d07435eb0cf58b2094f.tar.gz
mitmproxy-1135666ee6fb145491eb6d07435eb0cf58b2094f.tar.bz2
mitmproxy-1135666ee6fb145491eb6d07435eb0cf58b2094f.zip
Merge branch 'master' into issue_341
Diffstat (limited to 'libmproxy/console/__init__.py')
-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"