games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-04-21 12:06:49 +02:00
Code Issues Releases Activity

Possible deadlock fixed.

Browse Source
This commit is contained in:
Michał W. Urbańczyk 2010-05-31 23:53:35 +00:00
parent 068350a781
commit 124f0dd401
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/CPlayerInterface.cpp
View File

@ -1268,10 +1268,6 @@ void CPlayerInterface::update()
if(terminate_cond.get()) if(terminate_cond.get())
return; return;
//in some conditions we may receive calls before selection is initialized - we must ignore them
if(!adventureInt->selection)
return;
//if there are any waiting dialogs, show them //if there are any waiting dialogs, show them
if(dialogs.size() && !showingDialog->get()) if(dialogs.size() && !showingDialog->get())
{ {
@ -1280,6 +1276,10 @@ void CPlayerInterface::update()
dialogs.pop_front(); dialogs.pop_front();
} }
//in some conditions we may receive calls before selection is initialized - we must ignore them
if(!adventureInt->selection && GH.topInt() == adventureInt)
return;
GH.updateTime(); GH.updateTime();
GH.handleEvents(); GH.handleEvents();