cpp/openttd-patchpack/source Changeset - r10182:13ce7c8953d0

Changeset - r10182:13ce7c8953d0

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

rubidium - 16 years ago 2008-09-23 20:12:13
rubidium@openttd.org

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

1 file changed with 11 insertions and 3 deletions:

src/signs_gui.cpp

0 comments (0 inline, 0 general)

src/signs_gui.cpp

➞

Show inline comments

@@ @@ -171,10 +171,18 @@ void ShowSignList() @@
 	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;
 	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 {
@@ @@ -288,7 +296,7 @@ struct SignWindow : QueryStringBaseWindo @@
 				break;
 			case QUERY_EDIT_SIGN_WIDGET_OK:
 				RenameSign(this->cur_sign, this->text.buf);
+				if (RenameSign(this->cur_sign, this->text.buf)) break;
 				/* FALL THROUGH */
 			case QUERY_EDIT_SIGN_WIDGET_CANCEL:
@@ @@ -302,7 +310,7 @@ struct SignWindow : QueryStringBaseWindo @@
 		EventState state = ES_NOT_HANDLED;
 		switch (this->HandleEditBoxKey(QUERY_EDIT_SIGN_WIDGET_TEXT, key, keycode, state)) {
 			case 1: // Enter pressed, confirms change
 				RenameSign(this->cur_sign, this->text.buf);
+				if (RenameSign(this->cur_sign, this->text.buf)) break;
 				/* FALL THROUGH */
 			case 2: // ESC pressed, closes window, abandons changes

0 comments (0 inline, 0 general)