From bbc173dfc6461834c7f3419540dd49fa9c2b06d5 Mon Sep 17 00:00:00 2001 From: glx Date: Wed, 14 May 2008 02:32:35 +0000 Subject: (svn r13083) -Fix (r13042): another segmentation fault when OskWindow's parent closes it --- src/osk_gui.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/osk_gui.cpp') diff --git a/src/osk_gui.cpp b/src/osk_gui.cpp index 49d869765..32d7ff41c 100644 --- a/src/osk_gui.cpp +++ b/src/osk_gui.cpp @@ -171,6 +171,8 @@ struct OskWindow : public Window { /* pass information by simulating a button press on parent window */ if (this->ok_btn != 0) { this->parent->OnClick(pt, this->ok_btn); + /* Window gets deleted when the parent window removes itself. */ + return; } } delete_this = true; @@ -180,6 +182,7 @@ struct OskWindow : public Window { if (this->cancel_btn != 0) { // pass a cancel event to the parent window this->parent->OnClick(pt, this->cancel_btn); /* Window gets deleted when the parent window removes itself. */ + return; } else { // or reset to original string strcpy(qs->text.buf, this->orig_str_buf); UpdateTextBufferSize(&qs->text); -- cgit v1.2.3-54-g00ecf