summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/webserver
diff options
context:
space:
mode:
authorPekka Lampila <pekka.lampila@iki.fi>2014-02-18 04:27:42 +0200
committerPekka Lampila <pekka.lampila@iki.fi>2014-02-18 05:14:11 +0200
commitfd03bf8644ca82bb3de2f89a30f07f69e0860a9f (patch)
treeee9291011caffc695cd2f39035bda09e919be1dc /crawl-ref/source/webserver
parentd9d4033417ed018d913a8c05b8e01bf3736ab6f5 (diff)
downloadcrawl-ref-fd03bf8644ca82bb3de2f89a30f07f69e0860a9f.tar.gz
crawl-ref-fd03bf8644ca82bb3de2f89a30f07f69e0860a9f.zip
Fix player being sent WebTiles options twice.
Diffstat (limited to 'crawl-ref/source/webserver')
-rw-r--r--crawl-ref/source/webserver/process_handler.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/webserver/process_handler.py b/crawl-ref/source/webserver/process_handler.py
index 77ff82b37e..a8aea1d0a7 100644
--- a/crawl-ref/source/webserver/process_handler.py
+++ b/crawl-ref/source/webserver/process_handler.py
@@ -215,7 +215,8 @@ class CrawlProcessHandlerBase(object):
self.last_watcher_join = time.time()
if self.client_path:
self._send_client(watcher)
- watcher.send_json_options(self.game_params["id"], self.username)
+ if watcher.watched_game == self:
+ watcher.send_json_options(self.game_params["id"], self.username)
self._receivers.add(watcher)
self.update_watcher_description()
@@ -229,7 +230,7 @@ class CrawlProcessHandlerBase(object):
def send_client_to_all(self):
for receiver in self._receivers:
self._send_client(receiver)
- if receiver.watched_game:
+ if receiver.watched_game == self:
receiver.send_json_options(self.game_params["id"],
self.username)