From e2922c784c29659206f400c4704e345af2dc4b49 Mon Sep 17 00:00:00 2001
From: Uriziel <urizieli@gmail.com>
Date: Tue, 6 May 2014 00:19:08 +0200
Subject: [PATCH] Removed issue with watcher being removed twice from a room

---
 syncplay/server.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/syncplay/server.py b/syncplay/server.py
index c098bf0..0d50c82 100644
--- a/syncplay/server.py
+++ b/syncplay/server.py
@@ -73,8 +73,9 @@ class SyncFactory(Factory):
         self._roomManager.broadcast(watcher, l)
 
     def removeWatcher(self, watcher):
-        self.sendLeftMessage(watcher)
-        self._roomManager.removeWatcher(watcher)
+        if watcher.getRoom():
+            self.sendLeftMessage(watcher)
+            self._roomManager.removeWatcher(watcher)
 
     def sendLeftMessage(self, watcher):
         l = lambda w: w.sendSetting(watcher.getName(), watcher.getRoom(), None, {"left": True})