diff options
Diffstat (limited to 'libmproxy/flow.py')
| -rwxr-xr-x | libmproxy/flow.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libmproxy/flow.py b/libmproxy/flow.py index 9a6b5527..2c4c5513 100755 --- a/libmproxy/flow.py +++ b/libmproxy/flow.py @@ -1387,6 +1387,8 @@ class FlowMaster(controller.Master): self.kill_nonreplay = kill def stop_server_playback(self): + if self.server_playback.exit: + self.shutdown() self.server_playback = None def do_server_playback(self, flow): @@ -1420,10 +1422,6 @@ class FlowMaster(controller.Master): self.shutdown() self.client_playback.tick(self) - if self.server_playback: - if self.server_playback.exit and self.server_playback.count() == 0: - self.shutdown() - return controller.Master.tick(self, q) def duplicate_flow(self, f): |