Mercurial > hg > openttd
changeset 14050:350c674deca7 draft
(svn r18593) -Fix: GetWidget call case similar to r18591
| author | rubidium <rubidium@openttd.org> |
|---|---|
| date | Mon, 21 Dec 2009 18:20:18 +0000 |
| parents | d7bb77a690b4 |
| children | c4abaa58f16d |
| files | src/widget.cpp |
| diffstat | 1 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/widget.cpp +++ b/src/widget.cpp @@ -2090,7 +2090,11 @@ if (this->type == WWT_SCROLL2BAR) return &w->vscroll2; if (this->index >= 0 && allow_next && (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); } return NULL;