summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/menu.cc
diff options
context:
space:
mode:
authorFlorian Diebold <flodiebold@gmail.com>2013-05-06 17:21:31 +0200
committerFlorian Diebold <flodiebold@gmail.com>2013-05-06 17:21:31 +0200
commitfac9a833ab5559de67420d33a627c6277196f73f (patch)
tree9147801045acccaa6a6d37da726514f156689a4b /crawl-ref/source/menu.cc
parentfb897f4cdf85abb1616226f6eb97e64d6ac7b0f4 (diff)
downloadcrawl-ref-fac9a833ab5559de67420d33a627c6277196f73f.tar.gz
crawl-ref-fac9a833ab5559de67420d33a627c6277196f73f.zip
Fix a problem with Webtiles formatted_scroller handling.
The webtiles_write_menu call in formatted_scroller::jump_to could happen before the menu was sent, which would then result in two menus on the client side. This was revealed by the message combining changes, because the two menus would both be in the same message and the second would be ignored by the client before.
Diffstat (limited to 'crawl-ref/source/menu.cc')
-rw-r--r--crawl-ref/source/menu.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/crawl-ref/source/menu.cc b/crawl-ref/source/menu.cc
index eddb7012d8..4d50abdd7f 100644
--- a/crawl-ref/source/menu.cc
+++ b/crawl-ref/source/menu.cc
@@ -1882,7 +1882,11 @@ bool formatted_scroller::jump_to(int i)
#ifdef USE_TILE_WEB
webtiles_update_section_boundaries();
- webtiles_write_menu(true);
+ if (tiles.is_in_menu(this))
+ {
+ webtiles_write_menu(true);
+ tiles.finish_message();
+ }
#endif
return true;