Merge branch 'dev'

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v1.2.1 (2015-09-29)
+
+* Fix for possible issue when paused_counter is null.
+
+
 ## v1.2.0 (2015-09-29)
 
 * Added option to group consecutive plays in the history tables.

plexpy/activity_processor.py

@@ -354,7 +354,10 @@ class ActivityProcessor(object):
             for session in result:
                 if session['last_paused']:
                     paused_offset = int(time.time()) - int(session['last_paused'])
-                    paused_counter = int(session['paused_counter']) + int(paused_offset)
+                    if session['paused_counter']:
+                        paused_counter = int(session['paused_counter']) + int(paused_offset)
+                    else:
+                        paused_counter = int(paused_offset)
 
             values = {'state': 'playing',
                       'last_paused': timestamp

plexpy/version.py

@@ -1,2 +1,2 @@
 PLEXPY_VERSION = "master"
-PLEXPY_RELEASE_VERSION = "1.2.0"
+PLEXPY_RELEASE_VERSION = "1.2.1"