mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-29 10:49:48 +02:00
Code Issues Projects Releases Wiki Activity

fixed a null pointer problem in gui

Browse Source
This commit is contained in:
titiger
2015-09-05 22:46:15 +02:00
parent fd8e29c901
commit c3e2305e41
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/glest_game/gui/gui.cpp
View File

@@ -629,7 +629,7 @@ void Gui::mouseDownDisplayUnitSkills(int posDisplay) {
const CommandType *ct = display.getCommandType(posDisplay); const CommandType *ct = display.getCommandType(posDisplay);
// try to switch to next attack type // try to switch to next attack type
if(activeCommandClass == ccAttack) { if(activeCommandClass == ccAttack && activeCommandType!=NULL) {
int maxI = unit->getType()->getCommandTypeCount(); int maxI = unit->getType()->getCommandTypeCount();
int cmdTypeId = activeCommandType->getId(); int cmdTypeId = activeCommandType->getId();
@@ -651,7 +651,7 @@ void Gui::mouseDownDisplayUnitSkills(int posDisplay) {
} }
if(ct != NULL && unit->getFaction()->reqsOk(ct)) { if(ct != NULL && unit->getFaction()->reqsOk(ct)) {
activeCommandType= display.getCommandType(posDisplay); activeCommandType= ct;
activeCommandClass= activeCommandType->getClass(); activeCommandClass= activeCommandType->getClass();
} }
else { else {