mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r13083) -Fix (r13042): another segmentation fault when OskWindow's parent closes it

release/0.7
glx 2008-05-14 02:32:35 +00:00
parent c9f26cceb7
commit bbc173dfc6
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/osk_gui.cpp
View File

@ -171,6 +171,8 @@ struct OskWindow : public Window {
/* pass information by simulating a button press on parent window */ /* pass information by simulating a button press on parent window */
if (this->ok_btn != 0) { if (this->ok_btn != 0) {
this->parent->OnClick(pt, this->ok_btn); this->parent->OnClick(pt, this->ok_btn);
/* Window gets deleted when the parent window removes itself. */
return;
} }
} }
delete_this = true; delete_this = true;
@ -180,6 +182,7 @@ struct OskWindow : public Window {
if (this->cancel_btn != 0) { // pass a cancel event to the parent window if (this->cancel_btn != 0) { // pass a cancel event to the parent window
this->parent->OnClick(pt, this->cancel_btn); this->parent->OnClick(pt, this->cancel_btn);
/* Window gets deleted when the parent window removes itself. */ /* Window gets deleted when the parent window removes itself. */
return;
} else { // or reset to original string } else { // or reset to original string
strcpy(qs->text.buf, this->orig_str_buf); strcpy(qs->text.buf, this->orig_str_buf);
UpdateTextBufferSize(&qs->text); UpdateTextBufferSize(&qs->text);