1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix: deadlock on ammo creation popup

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8385 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2017-01-31 21:05:01 +00:00
parent a6b641d701
commit 48254ea5a5
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Interface Items.cpp
+7 -1
View File
@@ -1886,7 +1886,10 @@ void popupCallbackAmmo(UINT16 item, UINT16 pocket, SOLDIERTYPE* pSoldier ){
{ {
clipCreated = false; clipCreated = false;
bLoop = tempStack.ubNumberOfObjects; bLoop = tempStack.ubNumberOfObjects;
while(tempStack.ubNumberOfObjects > 0)
// Flugente: This is just asking for trouble if AddObjectsToStack(...) fails. As we don't know from its return value whether it worked (wtf?), we exit in a different way
int loopcnt = bLoop;
while ( tempStack.ubNumberOfObjects > 0 && loopcnt > 0 )
{ {
if(pocket != -1) if(pocket != -1)
{ {
@@ -1898,7 +1901,10 @@ void popupCallbackAmmo(UINT16 item, UINT16 pocket, SOLDIERTYPE* pSoldier ){
} }
if(bLoop < 1) if(bLoop < 1)
break; break;
--loopcnt;
} }
if(tempStack.ubNumberOfObjects < 1) if(tempStack.ubNumberOfObjects < 1)
clipCreated = true; clipCreated = true;
else else