diff options
Diffstat (limited to 'src/osk_gui.cpp')
| -rw-r--r-- | src/osk_gui.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/osk_gui.cpp b/src/osk_gui.cpp index a9897b3b4..f3b21a650 100644 --- a/src/osk_gui.cpp +++ b/src/osk_gui.cpp @@ -75,14 +75,9 @@ struct OskWindow : public Window { this->parent = parent; assert(parent != NULL); - if (parent->widget != NULL) { - this->caption = (parent->widget[button].data != STR_NULL) ? parent->widget[button].data : parent->caption; - } - if (parent->nested_array != NULL) { - NWidgetCore *par_wid = parent->GetWidget<NWidgetCore>(button); - assert(par_wid != NULL); - this->caption = (par_wid->widget_data != STR_NULL) ? par_wid->widget_data : parent->caption; - } + NWidgetCore *par_wid = parent->GetWidget<NWidgetCore>(button); + assert(par_wid != NULL); + this->caption = (par_wid->widget_data != STR_NULL) ? par_wid->widget_data : parent->caption; this->qs = parent; this->text_btn = button; |