0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't assert if no tips are defined.

Browse source 
(Fixes bug #16731).
This commit is contained in:
Mark de Wever 2010-09-25 09:38:21 +00:00
parent d3857f4aea
commit 32c32067cb
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog
View file

@ -31,6 +31,8 @@ Version 1.9.1+svn:
* Fixed: A resize glitch causing resize events to be lost.
* Changed: All buttons in the title screen now have a hotkey.
* Changed: Refresh cache hotkey is CMD+F5 on the Mac by default now.
* Fixed: Don't trigger an assertion failure if no tips are defined
(bug #16731).
* WML Engine:
* id= in SUFs now accepts a comma-separated list
* [capture_village] now accepts a full SLF

6
src/gui/dialogs/title_screen.cpp
View file

@ -37,6 +37,7 @@
static lg::log_domain log_config("config");
#define ERR_CF LOG_STREAM(err, log_config)
#define WRN_CF LOG_STREAM(warn, log_config)
namespace gui2 {
@ -395,7 +396,10 @@ void ttitle_screen::update_tip(twindow& window, const bool previous)
{
next_tip_of_day(tips_, previous);
const config *tip = get_tip_of_day(tips_);
assert(tip);
if(!tip) {
WRN_CF << "There are not tips of day defined.\n";
return;
}
find_widget<tlabel>(&window, "tip", false).set_label((*tip)["text"]);
find_widget<tlabel>(&window, "source", false).set_label((*tip)["source"]);