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

(svn r18591) -Fix [FS#3399]: FindScrollbar could trigger an assert if the next widget (in the widget array) was a container-ish (e.g. selection) widget

release/1.0
rubidium 2009-12-21 18:12:25 +00:00
parent 7c4e8421be
commit 64ac99a6c1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/widget.cpp
View File

@ -1601,7 +1601,11 @@ NWidgetCore *NWidgetBackground::GetWidgetFromPos(int x, int y)
Scrollbar *NWidgetBackground::FindScrollbar(Window *w, bool allow_next) const Scrollbar *NWidgetBackground::FindScrollbar(Window *w, bool allow_next) const
{ {
if (this->index >= 0 && allow_next && this->child == NULL && (uint)(this->index) + 1 < w->nested_array_size) { if (this->index >= 0 && allow_next && this->child == NULL && (uint)(this->index) + 1 < w->nested_array_size) {
const NWidgetCore *next_wid = w->GetWidget<NWidgetCore>(this->index + 1); /* GetWidget ensures that the widget is of the given type.
* As we might have cases where the next widget in the array
* is a non-Core widget (e.g. NWID_SELECTION) we first get
* the base class and then dynamic_cast that. */
const NWidgetCore *next_wid = dynamic_cast<NWidgetCore>(w->GetWidget<NWidgetBase>(this->index + 1));
if (next_wid != NULL) return next_wid->FindScrollbar(w, false); if (next_wid != NULL) return next_wid->FindScrollbar(w, false);
} }
return NULL; return NULL;