(svn r17502) -Codechange [FS#3184]: Extend QueryStringBaseWindow to support windows with nested widgets (by Terkhen with a few tweaks).

1 files changed, 7 insertions, 1 deletions

diff --git a/src/osk_gui.cpp b/src/osk_gui.cpp
index 7858c7f46..4aa4285f7 100644
--- a/src/osk_gui.cpp
+++ b/src/osk_gui.cpp
@@ -75,7 +75,13 @@ struct OskWindow : public Window {
 		this->parent = parent;
 		assert(parent != NULL);
 
-		this->caption = (parent->widget[button].data != STR_NULL) ? parent->widget[button].data : parent->caption;
+		if (parent->widget != NULL) {
+			this->caption = (parent->widget[button].data != STR_NULL) ? parent->widget[button].data : parent->caption;
+		}
+		if (parent->nested_array != NULL) {
+			assert(parent->nested_array[button] != NULL);
+			this->caption = (parent->nested_array[button]->widget_data != STR_NULL) ? parent->nested_array[button]->widget_data : parent->caption;
+		}
 
 		this->qs         = parent;
 		this->text_btn   = button;