gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-07-05 20:09:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

(svn r14393) -Fix [FS#2318]: deleting the same window (pointer) twice.

Browse Source
This commit is contained in:
rubidium 2008-09-23 20:12:13 +00:00
parent 57d592828b
commit a143100f46
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/signs_gui.cpp
View File

@ -171,10 +171,18 @@ void ShowSignList()
AllocateWindowDescFront<SignListWindow>(&_sign_list_desc, 0); AllocateWindowDescFront<SignListWindow>(&_sign_list_desc, 0);
} }
static void RenameSign(SignID index, const char *text) /**
* Actually rename the sign.
* @param index the sign to rename.
* @param text the new name.
* @return true if the window will already be removed after returning.
*/
static bool RenameSign(SignID index, const char *text)
{ {
bool remove = StrEmpty(text);
_cmd_text = text; _cmd_text = text;
DoCommandP(0, index, 0, NULL, CMD_RENAME_SIGN | (StrEmpty(text) ? CMD_MSG(STR_CAN_T_DELETE_SIGN) : CMD_MSG(STR_280C_CAN_T_CHANGE_SIGN_NAME))); DoCommandP(0, index, 0, NULL, CMD_RENAME_SIGN | (StrEmpty(text) ? CMD_MSG(STR_CAN_T_DELETE_SIGN) : CMD_MSG(STR_280C_CAN_T_CHANGE_SIGN_NAME)));
return remove;
} }
enum QueryEditSignWidgets { enum QueryEditSignWidgets {
@ -288,7 +296,7 @@ struct SignWindow : QueryStringBaseWindow, SignList {
break; break;
case QUERY_EDIT_SIGN_WIDGET_OK: case QUERY_EDIT_SIGN_WIDGET_OK:
RenameSign(this->cur_sign, this->text.buf); if (RenameSign(this->cur_sign, this->text.buf)) break;
/* FALL THROUGH */ /* FALL THROUGH */
case QUERY_EDIT_SIGN_WIDGET_CANCEL: case QUERY_EDIT_SIGN_WIDGET_CANCEL:
@ -302,7 +310,7 @@ struct SignWindow : QueryStringBaseWindow, SignList {
EventState state = ES_NOT_HANDLED; EventState state = ES_NOT_HANDLED;
switch (this->HandleEditBoxKey(QUERY_EDIT_SIGN_WIDGET_TEXT, key, keycode, state)) { switch (this->HandleEditBoxKey(QUERY_EDIT_SIGN_WIDGET_TEXT, key, keycode, state)) {
case 1: // Enter pressed, confirms change case 1: // Enter pressed, confirms change
RenameSign(this->cur_sign, this->text.buf); if (RenameSign(this->cur_sign, this->text.buf)) break;
/* FALL THROUGH */ /* FALL THROUGH */
case 2: // ESC pressed, closes window, abandons changes case 2: // ESC pressed, closes window, abandons changes