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

Merge pull request #273 from dydzio0614/CommanderCrash

Browse Source 
Ah right, I forgot about this bug :/. Thanks.
This commit is contained in:
DjWarmonger 2017-02-02 21:20:15 +01:00 committed by GitHub
commit 1e38b29add
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/windows/CCreatureWindow.cpp
View File

@ -822,8 +822,8 @@ void CStackWindow::init()
info->stackNode = new CStackInstance(info->creature, 1);// FIXME: free data info->stackNode = new CStackInstance(info->creature, 1);// FIXME: free data
selectedIcon = nullptr; selectedIcon = nullptr;
selectedSkill = 0; selectedSkill = -1;
if (info->levelupInfo) if (info->levelupInfo && !info->levelupInfo->skills.empty())
selectedSkill = info->levelupInfo->skills.front(); selectedSkill = info->levelupInfo->skills.front();
commanderTab = nullptr; commanderTab = nullptr;
@ -913,6 +913,6 @@ CStackWindow::CStackWindow(const CCommanderInstance * commander, std::vector<ui3
CStackWindow::~CStackWindow() CStackWindow::~CStackWindow()
{ {
if (info->levelupInfo) if (info->levelupInfo && !info->levelupInfo->skills.empty())
info->levelupInfo->callback(vstd::find_pos(info->levelupInfo->skills, selectedSkill)); info->levelupInfo->callback(vstd::find_pos(info->levelupInfo->skills, selectedSkill));
} }