Browse Source

Basic fix for bug #2635

dydzio 8 years ago
parent
commit
81a00f59d1
1 changed files with 3 additions and 3 deletions
  1. 3 3
      client/windows/CCreatureWindow.cpp

+ 3 - 3
client/windows/CCreatureWindow.cpp

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