upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-04 00:03:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash when using debug_print in a GUI2 formula

Browse Source
This commit is contained in:
Celtic Minstrel 2017-04-28 15:33:00 -04:00
parent 819fa75330
commit 19fa4244af
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/formula/function.cpp
View File

@ -303,7 +303,7 @@ private:
const variant var2 = args()[1]->evaluate(variables,fdb);
str2 = var2.to_debug_string(true);
LOG_SF << str1 << ": " << str2 << std::endl;
if(game_config::debug) {
if(game_config::debug && game_display::get_singleton()) {
game_display::get_singleton()->get_chat_manager().add_chat_message(time(nullptr), str1, 0, str2, events::chat_handler::MESSAGE_PUBLIC, false);
}
return var2;
@ -337,7 +337,7 @@ private:
std::ostringstream str;
str << "Evaluated in " << (run_time / 1000.0) << " ms on average";
LOG_SF << speaker << ": " << str.str() << std::endl;
if(game_config::debug) {
if(game_config::debug && game_display::get_singleton()) {
game_display::get_singleton()->get_chat_manager().add_chat_message(time(nullptr), speaker, 0, str.str(), events::chat_handler::MESSAGE_PUBLIC, false);
}
return value;