petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r13082) -Fix (r13042): segmentation fault due to too early deletion of OskWindow.

Browse Source
This commit is contained in:
glx
2008-05-14 01:57:12 +00:00
parent b4682bff97
commit c9f26cceb7
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/osk_gui.cpp
View File

@@ -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()