# HG changeset patch # User frosch # Date 2009-11-26 22:46:13 # Node ID c61ac7ca125e3ac3ec15e69ca68639b881ed922a # Parent a1f85abe423ffcfa5345799aabc7dbbf0d7c957a (svn r18303) -Fix: Widget indices are valid when >= 0. diff --git a/src/widget.cpp b/src/widget.cpp --- a/src/widget.cpp +++ b/src/widget.cpp @@ -1589,7 +1589,7 @@ NWidgetCore *NWidgetBackground::GetWidge 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(this->index + 1); if (next_wid != NULL) return next_wid->FindScrollbar(w, false); } @@ -2058,7 +2058,7 @@ Scrollbar *NWidgetLeaf::FindScrollbar(Wi if (this->type == WWT_SCROLLBAR) return &w->vscroll; if (this->type == WWT_SCROLL2BAR) return &w->vscroll2; - if (this->index > 0 && allow_next && (uint)(this->index) + 1 < w->nested_array_size) { + if (this->index >= 0 && allow_next && (uint)(this->index) + 1 < w->nested_array_size) { const NWidgetCore *next_wid = w->GetWidget(this->index + 1); if (next_wid != NULL) return next_wid->FindScrollbar(w, false); }