mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-21 15:41:24 +02:00
Code Issues Projects Releases Wiki Activity

bugfix for crash ( when no unit is selected and display text is calculated )

Browse Source
This commit is contained in:
Titus Tscharntke
2011-05-01 22:28:42 +00:00
parent 7863212a94
commit c8bb5e6fce
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

@@ -615,7 +615,7 @@ string Gui::computeDefaultInfoString(){
string result=""; string result="";
if(selection.isCommandable() && selection.isUniform()){ if((!selection.isEmpty()) && selection.isCommandable() && selection.isUniform()){
// default is the description extension // default is the description extension
result=selection.getFrontUnit()->getDescExtension(); result=selection.getFrontUnit()->getDescExtension();
} }
@@ -631,7 +631,7 @@ void Gui::computeInfoString(int posDisplay){
display.setInfoText(computeDefaultInfoString()); display.setInfoText(computeDefaultInfoString());
if(posDisplay!=invalidPos && selection.isCommandable()){ if((!selection.isEmpty()) && posDisplay!=invalidPos && selection.isCommandable()){
if(!selectingBuilding){ if(!selectingBuilding){
if(posDisplay==cancelPos){ if(posDisplay==cancelPos){
display.setInfoText(lang.get("Cancel")); display.setInfoText(lang.get("Cancel"));