games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-27 22:49:25 +02:00
Code Issues Releases Activity

- minor tweaks to quest window

Browse Source 
- fixed #531
- fixed query crash (empty funciton)
This commit is contained in:
Ivan Savenko
2012-07-21 20:16:54 +00:00
parent 0665850d9d
commit 13de841e10
16 changed files with 116 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/CGameHandler.cpp
View File

@@ -912,7 +912,7 @@ void CGameHandler::handleConnection(std::set<int> players, CConnection &c)
tlog1 << e.what() << std::endl;
end2 = true;
}
HANDLE_EXCEPTION(end2 = true);
//HANDLE_EXCEPTION(end2 = true);
tlog1 << "Ended handling connection\n";
}
@@ -4760,7 +4760,8 @@ void CGameHandler::showGarrisonDialog( int upobj, int hid, bool removableUnits,
callbacks[gd.queryID] = [=](ui32 answer)
{
// Garrison callback calls the "original callback" and closes the exchange between objs.
cb();
if (cb)
cb();
boost::unique_lock<boost::recursive_mutex> lockGsm(this->gsm);
allowedExchanges.erase(gd.queryID);
};