fix client playback logic

1 files changed, 8 insertions, 7 deletions

diff --git a/mitmproxy/flow.py b/mitmproxy/flow.py
index 047ec68b..f5e238a2 100644
--- a/mitmproxy/flow.py
+++ b/mitmproxy/flow.py
@@ -816,23 +816,24 @@ class FlowMaster(controller.Master):
                 self.client_playback.done() and
                 self.state.active_flow_count() == 0
             )
-            exit = stop and self.client_playback.exit
+            exit = self.client_playback.exit
             if stop:
                 self.stop_client_playback()
-            if exit:
-                self.shutdown()
-            self.client_playback.tick(self)
+                if exit:
+                    self.shutdown()
+            else:
+                self.client_playback.tick(self)
 
         if self.server_playback:
             stop = (
                 self.server_playback.count() == 0 and
                 self.state.active_flow_count() == 0
             )
-            exit = stop and self.server_playback.exit
+            exit = self.server_playback.exit
             if stop:
                 self.stop_server_playback()
-            if exit:
-                self.shutdown()
+                if exit:
+                    self.shutdown()
         return super(FlowMaster, self).tick(q, timeout)
 
     def duplicate_flow(self, f):