games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-17 01:32:21 +02:00
Code Issues Releases Activity

Merge pull request #4982 from kdmcser/fix_dismiss_crash

Browse Source 
crash fix: dismiss hero when pick artifact
This commit is contained in:
Ivan Savenko
2024-11-27 16:41:44 +02:00
committed by GitHub
parent fe2f765322 993a4dc73d
commit c3494b4a73
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/widgets/CArtifactsOfHeroBase.cpp
View File

@ -140,6 +140,8 @@ void CArtifactsOfHeroBase::gestureArtPlace(CComponentHolder & artPlace, const Po
void CArtifactsOfHeroBase::setHero(const CGHeroInstance * hero) void CArtifactsOfHeroBase::setHero(const CGHeroInstance * hero)
{ {
curHero = hero; curHero = hero;
if (!hero)
return;
for(auto slot : artWorn) for(auto slot : artWorn)
{ {

1
client/widgets/CArtifactsOfHeroMain.cpp
View File

@ -28,6 +28,7 @@ CArtifactsOfHeroMain::CArtifactsOfHeroMain(const Point & position)
CArtifactsOfHeroMain::~CArtifactsOfHeroMain() CArtifactsOfHeroMain::~CArtifactsOfHeroMain()
{ {
if(curHero)
CArtifactsOfHeroBase::putBackPickedArtifact(); CArtifactsOfHeroBase::putBackPickedArtifact();
} }

1
client/windows/CHeroWindow.cpp
View File

@ -312,6 +312,7 @@ void CHeroWindow::dismissCurrent()
arts->putBackPickedArtifact(); arts->putBackPickedArtifact();
close(); close();
LOCPLINT->cb->dismissHero(curHero); LOCPLINT->cb->dismissHero(curHero);
arts->setHero(nullptr);
}, nullptr); }, nullptr);
} }