1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-05 00:49:09 +02:00

Basic fix for bug #2635

This commit is contained in:
dydzio
2017-02-02 19:17:15 +01:00
parent c91bc25e70
commit 81a00f59d1

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));
} }