games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-09-16 09:26:28 +02:00
Code Issues Releases Activity

Fixed #956.

Browse Source 
Removed unused code left after tests.
Updated changelog.
This commit is contained in:
Michał W. Urbańczyk
2012-05-19 22:57:24 +00:00
parent a13a62537b
commit a234b4c935
3 changed files with 55 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/CPlayerInterface.cpp
View File

@@ -1207,9 +1207,10 @@ bool CPlayerInterface::moveHero( const CGHeroInstance *h, CGPath path )
bool result = false; //TODO why not set to true anywhere?
{
//evil...
auto unlockEvents = vstd::makeUnlockGuard(eventsM);
auto unlockGs = vstd::makeUnlockSharedGuard(cb->getGsMutex()); //GS mutex is above PIM because CClient::run thread first locks PIM and then GS -> so this way we avoid deadlocks
auto unlockPim = vstd::makeUnlockGuard(*pim);
auto unlockGs = vstd::makeUnlockSharedGuard(cb->getGsMutex());
{
path.convert(0);