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

This commit is contained in:
Titus Tscharntke
2011-05-01 22:28:42 +00:00
parent 7863212a94
commit c8bb5e6fce

View File

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