fly/flightgear
1
0
Fork 0
Code Activity

- don't crash if user clicked "Apply" but hasn't selected an airport

Browse source 
- re-order information from  "LOXT  Tulln"  to  "Tulln  (LOXT)".
  The list is sorted by airport name and columns aren't aligned, so this
  looks way cleaner.
This commit is contained in:
mfranz 2006-03-25 08:47:53 +00:00
parent 651db1845b
commit 8d9f8e5761
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/GUI/AirportList.cxx
View file

@ -17,12 +17,12 @@ AirportList::AirportList (int x, int y, int width, int height)
_content = new char *[_nAirports+1]; _content = new char *[_nAirports+1];
for (int i = 0; i < _nAirports; i++) { for (int i = 0; i < _nAirports; i++) {
const FGAirport *airport = _airports->getAirport(i); const FGAirport *airport = _airports->getAirport(i);
snprintf(buf, 1023, "%s %s", snprintf(buf, 1023, "%s (%s)",
airport->getId().c_str(), airport->getName().c_str(),
airport->getName().c_str()); airport->getId().c_str());
unsigned int buf_len = (strlen(buf) > 1023) ? 1023 : strlen(buf); unsigned int buf_len = (strlen(buf) > 1023) ? 1023 : strlen(buf);
_content[i] = new char[buf_len+1]; _content[i] = new char[buf_len+1];
memcpy(_content[i], buf, buf_len); memcpy(_content[i], buf, buf_len);
_content[i][buf_len] = '\0'; _content[i][buf_len] = '\0';
@ -43,7 +43,11 @@ AirportList::~AirportList ()
char * char *
AirportList::getListStringValue () AirportList::getListStringValue ()
{ {
return (char *)_airports->getAirport(getListIntegerValue())->getId().c_str(); int i = getListIntegerValue();
if (i >= 0)
return (char *)_airports->getAirport(i)->getId().c_str();
else
return "";
} }
// end of AirportList.cxx // end of AirportList.cxx