diff options
author | alberth <alberth@openttd.org> | 2009-07-20 18:39:38 +0000 |
---|---|---|
committer | alberth <alberth@openttd.org> | 2009-07-20 18:39:38 +0000 |
commit | 1978c7dc87cb39ff1a94f200cbba9034ca142f27 (patch) | |
tree | d33f3182450d013f0b3992b179cbb05f6b2df130 /src | |
parent | 38d88f10fe3b1e5fb46743f838234f6f9486eb29 (diff) | |
download | openttd-1978c7dc87cb39ff1a94f200cbba9034ca142f27.tar.xz |
(svn r16890) -Codechange: Allow raising and enabling/disabling of widgets even if they are not used.
Diffstat (limited to 'src')
-rw-r--r-- | src/window.cpp | 2 | ||||
-rw-r--r-- | src/window_gui.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/window.cpp b/src/window.cpp index 86b774364..00e42ff72 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -208,7 +208,7 @@ void Window::RaiseButtons() } if (this->nested_array != NULL) { for (uint i = 0; i < this->nested_array_size; i++) { - if (this->IsWidgetLowered(i)) { + if (this->nested_array[i] != NULL && this->IsWidgetLowered(i)) { this->RaiseWidget(i); this->InvalidateWidget(i); } diff --git a/src/window_gui.h b/src/window_gui.h index 846a5a2db..45ef5b8f7 100644 --- a/src/window_gui.h +++ b/src/window_gui.h @@ -274,7 +274,7 @@ public: } if (this->nested_array != NULL) { assert(widget_index < this->nested_array_size); - this->nested_array[widget_index]->SetDisabled(disab_stat); + if (this->nested_array[widget_index] != NULL) this->nested_array[widget_index]->SetDisabled(disab_stat); } } |