From 76518dcf6f16fb0bcbf1e9bb2b86dc8d59a23b27 Mon Sep 17 00:00:00 2001
From: Tomasz Fluxid Kowalczyk <accreg-git@fluxid.pl>
Date: Sun, 29 Jan 2012 17:04:27 +0100
Subject: [PATCH] Don't modify time by lag if paused

---
 syncplay/server.py | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/syncplay/server.py b/syncplay/server.py
index b935b21..38b3020 100644
--- a/syncplay/server.py
+++ b/syncplay/server.py
@@ -98,13 +98,6 @@ class WatcherInfo(object):
 
         self.counter = 0
 
-    def update_position(self, position):
-        if self.ping is not None:
-            position += self.ping
-        self.position = position
-        self.max_position = max(position, self.max_position)
-        self.last_update = time.time()
-
 
 class SyncFactory(Factory):
     def __init__(self, min_pause_lock = 3, update_time_limit = 1):
@@ -139,8 +132,13 @@ class SyncFactory(Factory):
         if not watcher:
             return
 
-        watcher.update_position(position)
+        if not paused and watcher.ping is not None:
+            position += watcher.ping
+        watcher.position = position
+        watcher.max_position = max(position, watcher.max_position)
+        watcher.last_update = time.time()
         watcher.counter = counter
+
         pause_changed = paused != self.paused
 
         curtime = time.time()
@@ -175,7 +173,7 @@ class SyncFactory(Factory):
         if curtime is None:
             curtime = time.time()
 
-        if watcher.ping is not None:
+        if not self.paused and watcher.ping is not None:
             position += watcher.ping
 
         if self.pause_change_by: