[Wesnoth-cvs-commits] wesnoth/src help.cpp

[Guillaume Melquiond]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Guillaume Melquiond <address@hidden>    05/01/08 22:11:21

Modified files:
        src            : help.cpp 

Log message:
        Don't display a text when its rendering has failed. Workaround for bug 
#11521.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/help.cpp.diff?tr1=1.64&tr2=1.65&r1=text&r2=text

Patches:
Index: wesnoth/src/help.cpp
diff -u wesnoth/src/help.cpp:1.64 wesnoth/src/help.cpp:1.65
--- wesnoth/src/help.cpp:1.64   Fri Dec 31 21:01:37 2004
+++ wesnoth/src/help.cpp        Sat Jan  8 22:11:21 2005
@@ -1865,7 +1865,8 @@
                // Always override the color if we have a cross reference.
                const SDL_Color color = ref_dst == "" ? text_color : 
font::YELLOW_COLOUR;
                surface surf(font::get_rendered_text(first_part, font_size, 
color, state));
-               add_item(item(surf, curr_loc_.first, curr_loc_.second, 
first_part, ref_dst));
+               if (!surf.null())
+                       add_item(item(surf, curr_loc_.first, curr_loc_.second, 
first_part, ref_dst));
                if (parts.size() > 1) {
                        // Parts remain, remove the first part from the string 
and
                        // add the remaining parts.