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

Fix crash on closing game during background image upscaling

Browse Source
This commit is contained in:
Ivan Savenko
2025-03-12 14:18:44 +00:00
parent 6855b895a0
commit 96d691b40c
10 changed files with 71 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
AI/Nullkiller/AIGateway.cpp
View File

@@ -10,6 +10,7 @@
#include "StdInc.h"
#include "../../lib/ArtifactUtils.h"
#include "../../lib/AsyncRunner.h"
#include "../../lib/UnlockGuard.h"
#include "../../lib/StartInfo.h"
#include "../../lib/entities/building/CBuilding.h"
@@ -32,8 +33,6 @@
#include "AIGateway.h"
#include "Goals/Goals.h"
static tbb::task_arena executeActionAsyncArena;
namespace NKAI
{
@@ -73,7 +72,7 @@ AIGateway::AIGateway()
destinationTeleport = ObjectInstanceID();
destinationTeleportPos = int3(-1);
nullkiller.reset(new Nullkiller());
asyncTasks = std::make_unique<tbb::task_group>();
asyncTasks = std::make_unique<AsyncRunner>();
}
AIGateway::~AIGateway()
@@ -593,11 +592,11 @@ void AIGateway::yourTurn(QueryID queryID)
nullkiller->makingTurnInterrupption.reset();
executeActionAsyncArena.enqueue(asyncTasks->defer([this]()
asyncTasks->run([this]()
{
ScopedThreadName guard("NKAI::makingTurn");
makeTurn();
}));
});
}
void AIGateway::heroGotLevel(const CGHeroInstance * hero, PrimarySkill pskill, std::vector<SecondarySkill> & skills, QueryID queryID)
@@ -1608,13 +1607,13 @@ void AIGateway::executeActionAsync(const std::string & description, const std::f
if (!asyncTasks)
throw std::runtime_error("Attempt to execute task on shut down AI state!");
executeActionAsyncArena.enqueue(asyncTasks->defer([this, description, whatToDo]()
asyncTasks->run([this, description, whatToDo]()
{
ScopedThreadName guard("NKAI::" + description);
SET_GLOBAL_STATE(this);
std::shared_lock gsLock(CGameState::mutex);
whatToDo();
}));
});
}
void AIGateway::lostHero(HeroPtr h)