Author: dave
Date: Sun Jul 1 01:01:19 2007
New Revision: 18582
URL: http://svn.gna.org/viewcvs/wesnoth?rev=18582&view=rev
Log:
fixed crash in multiplayer lobby if game status text is empty
Modified:
trunk/src/multiplayer_lobby.cpp
Modified: trunk/src/multiplayer_lobby.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/multiplayer_lobby.cpp?rev=18582&r1=18581&r2=18582&view=diff
==============================================================================
--- trunk/src/multiplayer_lobby.cpp (original)
+++ trunk/src/multiplayer_lobby.cpp Sun Jul 1 01:01:19 2007
@@ -189,13 +189,17 @@
xpos += vision_icon->w + h_padding_;
const surface status_text(font::get_rendered_text(game.status,
font::SIZE_NORMAL, font_color));
- const surface
vision_text(font::get_rendered_text(font::make_text_ellipsis(game.vision,
font::SIZE_NORMAL, maximum<int>((item_rect.x + item_rect.w - margin_ -
status_text->w - 2 * h_padding_) - xpos, 0)),font::SIZE_NORMAL,
font::NORMAL_COLOUR));
+
+ const int status_text_width = status_text ? status_text->w : 0;
+ const surface
vision_text(font::get_rendered_text(font::make_text_ellipsis(game.vision,
font::SIZE_NORMAL, maximum<int>((item_rect.x + item_rect.w - margin_ -
status_text_width - 2 * h_padding_) - xpos, 0)),font::SIZE_NORMAL,
font::NORMAL_COLOUR));
// draw vision text
video().blit_surface(xpos, ypos, vision_text);
// draw status text
- xpos = item_rect.x + item_rect.w - margin_ - status_text->w;
- video().blit_surface(xpos, ypos, status_text);
+ xpos = item_rect.x + item_rect.w - margin_ - status_text_width;
+ if(status_text) {
+ video().blit_surface(xpos, ypos, status_text);
+ }
//if(selected_ == index)
// draw_solid_tinted_rectangle(item_rect.x, item_rect.y,
item_rect.w, item_rect.h, 153, 0, 0, 0.3, video().getSurface());
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
