From 5a1203963fc50139bfe4d7cab27fa32d1d6fc9dc Mon Sep 17 00:00:00 2001 From: smatz Date: Tue, 16 Sep 2008 19:05:38 +0000 Subject: (svn r14345) -Fix: delete the RenameSignWindow when 'its' sign is deleted Also, it makes sure the RenameSignWindow isn't open when there are no signs (and crashes associted with that) --- src/signs_gui.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src/signs_gui.cpp') diff --git a/src/signs_gui.cpp b/src/signs_gui.cpp index ec89f5ebc..8b319a721 100644 --- a/src/signs_gui.cpp +++ b/src/signs_gui.cpp @@ -286,8 +286,9 @@ struct SignWindow : QueryStringBaseWindow, SignList { case QUERY_EDIT_SIGN_WIDGET_DELETE: /* Only need to set the buffer to null, the rest is handled as the OK button */ - DeleteTextBufferAll(&this->text); - /* FALL THROUGH */ + RenameSign(this->cur_sign, ""); + /* don't delete this, we are deleted in Sign::~Sign() -> DeleteRenameSignWindow() */ + break; case QUERY_EDIT_SIGN_WIDGET_OK: RenameSign(this->cur_sign, this->text.buf); @@ -358,3 +359,10 @@ void ShowRenameSignWindow(const Sign *si) new SignWindow(&_query_sign_edit_desc, si); } + +void DeleteRenameSignWindow(SignID sign) +{ + SignWindow *w = dynamic_cast(FindWindowById(WC_QUERY_STRING, 0)); + + if (w != NULL && w->cur_sign == sign) delete w; +} -- cgit v1.2.3-70-g09d2