diff options
Diffstat (limited to 'libmproxy/flow.py')
| -rw-r--r-- | libmproxy/flow.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmproxy/flow.py b/libmproxy/flow.py index 794d4950..5954f6ac 100644 --- a/libmproxy/flow.py +++ b/libmproxy/flow.py @@ -596,7 +596,7 @@ class FlowMaster(controller.Master): return True return None - def tick(self, q): + def tick(self, q, timeout): if self.client_playback: e = [ self.client_playback.done(), @@ -605,9 +605,9 @@ class FlowMaster(controller.Master): ] if all(e): self.shutdown() - self.client_playback.tick(self) + self.client_playback.tick(self, timeout) - return controller.Master.tick(self, q) + return controller.Master.tick(self, q, timeout) def duplicate_flow(self, f): return self.load_flow(f.copy()) |