Merge pull request #1322 from samwiseg00/fix/buffering_state_activity

Fix client buffering identification in certain scenarios
2018-10-09 20:45:57 -07:00
parent 7bdef05a45 1a46e09928
commit a88047eb9c
1 changed files with 3 additions and 3 deletions
--- a/plexpy/activity_handler.py
+++ b/plexpy/activity_handler.py
@@ -275,13 +275,13 @@ class ActivityHandler(object):
                        elif this_state == 'stopped':
                            self.on_stop()

-                    elif this_state == 'buffering':
-                        self.on_buffer()
-
                    elif this_state == 'paused':
                        # Update the session last_paused timestamp
                        self.on_pause(still_paused=True)

+                    if this_state == 'buffering':
+                        self.on_buffer()
+
                    if this_transcode_key != last_transcode_key and this_state != 'buffering':
                        self.on_change()