aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2016-09-09 10:03:36 +1200
committerAldo Cortesi <aldo@nullcube.com>2016-09-09 10:03:36 +1200
commitd4f291a8adfc6bfe7cd7820d9342868874895ad0 (patch)
treefe27d58b3db721406a9e45e6db8777e1061a2c62
parentea49b8a2e2f76a0abada248061ad960966f033da (diff)
downloadmitmproxy-d4f291a8adfc6bfe7cd7820d9342868874895ad0.tar.gz
mitmproxy-d4f291a8adfc6bfe7cd7820d9342868874895ad0.tar.bz2
mitmproxy-d4f291a8adfc6bfe7cd7820d9342868874895ad0.zip
Fix immediate server replay-related crash in mitmproxy
-rw-r--r--mitmproxy/console/master.py3
-rw-r--r--mitmproxy/console/statusbar.py6
2 files changed, 3 insertions, 6 deletions
diff --git a/mitmproxy/console/master.py b/mitmproxy/console/master.py
index a6942ca4..9d2fb78b 100644
--- a/mitmproxy/console/master.py
+++ b/mitmproxy/console/master.py
@@ -248,9 +248,6 @@ class ConsoleMaster(flow.FlowMaster):
if options.client_replay:
self.client_playback_path(options.client_replay)
- if options.server_replay:
- self.server_playback_path(options.server_replay)
-
self.view_stack = []
if options.app:
diff --git a/mitmproxy/console/statusbar.py b/mitmproxy/console/statusbar.py
index 43d68d51..a099e744 100644
--- a/mitmproxy/console/statusbar.py
+++ b/mitmproxy/console/statusbar.py
@@ -148,13 +148,13 @@ class StatusBar(urwid.WidgetWrap):
r.append("[")
r.append(("heading_key", "cplayback"))
r.append(":%s to go]" % self.master.client_playback.count())
- if self.master.server_playback:
+ if self.master.options.server_replay:
r.append("[")
r.append(("heading_key", "splayback"))
if self.master.options.nopop:
- r.append(":%s in file]" % self.master.server_playback.count())
+ r.append(":%s in file]" % self.master.options.server_replay.count())
else:
- r.append(":%s to go]" % self.master.server_playback.count())
+ r.append(":%s to go]" % self.master.options.server_replay.count())
if self.master.options.ignore_hosts:
r.append("[")
r.append(("heading_key", "I"))