mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r26167) -Fix [FS#5834]: Certain hotkeys crashed the content GUI when the list was empty.

release/1.4
frosch 2013-12-20 18:29:53 +00:00
parent ec492bfb77
commit 62c0d42f92
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/network/network_content_gui.cpp
View File

@ -750,7 +750,7 @@ public:
case WID_NCL_NAME: case WID_NCL_NAME:
if (this->content.SortType() == widget - WID_NCL_CHECKBOX) { if (this->content.SortType() == widget - WID_NCL_CHECKBOX) {
this->content.ToggleSortOrder(); this->content.ToggleSortOrder();
this->list_pos = this->content.Length() - this->list_pos - 1; if (this->content.Length() > 0) this->list_pos = this->content.Length() - this->list_pos - 1;
} else { } else {
this->content.SetSortType(widget - WID_NCL_CHECKBOX); this->content.SetSortType(widget - WID_NCL_CHECKBOX);
this->content.ForceResort(); this->content.ForceResort();
@ -844,7 +844,10 @@ public:
return ES_NOT_HANDLED; return ES_NOT_HANDLED;
} }
if (_network_content_client.Length() == 0) return ES_HANDLED; if (this->content.Length() == 0) {
this->list_pos = 0; // above stuff may result in "-1".
return ES_HANDLED;
}
this->selected = *this->content.Get(this->list_pos); this->selected = *this->content.Get(this->list_pos);