From 3dcba41d6d1f9c2d4307978b1176fe990d10bc5a Mon Sep 17 00:00:00 2001 From: Nick HS Date: Thu, 8 Jan 2015 13:56:19 -0500 Subject: Error to stdout when loading bad replays from the command line --- libmproxy/console/__init__.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'libmproxy/console/__init__.py') diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py index f5b6a2a6..1e7f8403 100644 --- a/libmproxy/console/__init__.py +++ b/libmproxy/console/__init__.py @@ -508,14 +508,22 @@ class ConsoleMaster(flow.FlowMaster): def client_playback_path(self, path): err, ret = self._readflow(path) if err: - self.statusbar.message(ret) + if not self.statusbar: + print >> sys.stderr, ret + sys.exit(1) + else: + self.statusbar.message(ret) else: self.start_client_playback(ret, False) def server_playback_path(self, path): err, ret = self._readflow(path) if err: - self.statusbar.message(ret) + if not self.statusbar: + print >> sys.stderr, ret + sys.exit(1) + else: + self.statusbar.message(ret) else: self.start_server_playback( ret, -- cgit v1.2.3 From 8af26bd0b7bbde32a95ce937afc178e75c51da71 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Fri, 9 Jan 2015 16:40:26 +0100 Subject: fix #443 --- libmproxy/console/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libmproxy/console/__init__.py') diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py index f5b6a2a6..a8c728a9 100644 --- a/libmproxy/console/__init__.py +++ b/libmproxy/console/__init__.py @@ -823,8 +823,8 @@ class ConsoleMaster(flow.FlowMaster): if changed: self.statusbar.redraw() size = self.drawscreen() - changed = self.tick(self.masterq, 0.01) - self.ui.set_input_timeouts(max_wait=0.01) + changed = self.tick(self.masterq, timeout=0.1) + self.ui.set_input_timeouts(max_wait=0) keys = self.ui.get_input() if keys: changed = True -- cgit v1.2.3