Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix bug #24553: Prevent the display (and others) from drawing over th…
…e storyscreen.

  This also adds a call to stop flips during a full redraw as a consequence of a window event.
  • Loading branch information
aginor committed Jul 29, 2016
1 parent f3d14a3 commit 15ff7e7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/events.cpp
Expand Up @@ -467,6 +467,7 @@ void pump()
}
//make sure this runs in it's own scope.
{
flip_locker flip_lock(CVideo::get_singleton());
for( std::deque<context>::iterator i = event_contexts.begin() ; i != event_contexts.end(); ++i) {
const handler_list& event_handlers = (*i).handlers;
for(auto handler : event_handlers) {
Expand Down
2 changes: 2 additions & 0 deletions src/storyscreen/render.cpp
Expand Up @@ -964,6 +964,8 @@ bool part_ui::handle_interface()

part_ui::RESULT part_ui::show()
{
update_locker locker(video_);

this->prepare_background();
this->prepare_geometry();
this->prepare_floating_images();
Expand Down

0 comments on commit 15ff7e7

Please sign in to comment.