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

Story Viewer: don't spawn floating image draw timer if delay is 0

Browse source
This commit is contained in:
Charles Dang 2017-04-11 13:52:26 +11:00
parent 4608c2d368
commit cd08fab8e4
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/gui/dialogs/story_viewer.cpp
View file

@ -328,9 +328,18 @@ void story_viewer::draw_floating_image(window& window, floating_image_list::cons
window.set_is_dirty(true);
// Schedule the next image draw. This *must* be a non-repeating timer!
timer_id_ = add_timer(floating_image.display_delay(),
std::bind(&story_viewer::draw_floating_image, this, std::ref(window), ++image_iter, this_part_index), false);
++image_iter
// If a delay is specified, schedule the next image draw. This *must* be a non-repeating timer!
// Else draw the next image immediately.
const unsigned int draw_delay = floating_image.display_delay();
if(draw_delay != 0) {
timer_id_ = add_timer(draw_delay,
std::bind(&story_viewer::draw_floating_image, this, std::ref(window), image_iter, this_part_index), false);
} else {
draw_floating_image(window, image_iter, this_part_index);
}
}
void story_viewer::nav_button_callback(window& window, NAV_DIRECTION direction)