From 015dbc6e7bdc72df94d53ad86d5f42037d97f47e Mon Sep 17 00:00:00 2001 From: glx Date: Wed, 14 May 2008 01:57:12 +0000 Subject: (svn r13082) -Fix (r13042): segmentation fault due to too early deletion of OskWindow. --- src/osk_gui.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/osk_gui.cpp b/src/osk_gui.cpp index b3955a822..49d869765 100644 --- a/src/osk_gui.cpp +++ b/src/osk_gui.cpp @@ -129,6 +129,8 @@ struct OskWindow : public Window { return; } + bool delete_this = false; + switch (widget) { case OSK_WIDGET_BACKSPACE: if (DeleteTextBufferChar(&this->qs->text, WKC_BACKSPACE)) this->InvalidateWidget(OSK_WIDGET_TEXT); @@ -171,7 +173,7 @@ struct OskWindow : public Window { this->parent->OnClick(pt, this->ok_btn); } } - delete this; + delete_this = true; break; case OSK_WIDGET_CANCEL: @@ -182,12 +184,13 @@ struct OskWindow : public Window { strcpy(qs->text.buf, this->orig_str_buf); UpdateTextBufferSize(&qs->text); MoveTextBufferPos(&qs->text, WKC_END); - delete this; + delete_this = true; } break; } /* make sure that the parent window's textbox also gets updated */ if (this->parent != NULL) this->parent->InvalidateWidget(this->text_btn); + if (delete_this) delete this; } virtual void OnMouseLoop() -- cgit v1.2.3-70-g09d2