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

Merge pull request #709 from jyrkive/fix-event-context-crash

Browse source 
Fix undefined behavior on destroying an event context
This commit is contained in:
Andreas 2016-07-23 11:09:34 +12:00 • committed by GitHub
commit b9b97bab84
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/events.cpp
View file

@ -132,15 +132,15 @@ void context::set_focus(const sdl_handler* ptr)
context::~context()
{
if (!handlers.empty()) {
for (handler_list::iterator it = handlers.begin(); it != handlers.end(); ++it) {
if ((*it)->has_joined()) {
(*it)->has_joined_ = false;
}
if ((*it)->has_joined_global()) {
(*it)->has_joined_global_ = false;
}
it = handlers.erase(it);
for (sdl_handler* h : handlers)
{
if (h->has_joined())
{
h->has_joined_ = false;
}
if (h->has_joined_global())
{
h->has_joined_global_ = false;
}
}
}