# HG changeset patch
# User smatz
# Date 1220804575 0
# Node ID 3159b77d3506fd6119e9825d13d267502a216d00
# Parent  259601e31f796ddd7fcfe055e429498335ae65af
(svn r14263) -Codechange: give a better error message when removing a sign fails

diff -r 259601e31f79 -r 3159b77d3506 src/lang/english.txt
--- a/src/lang/english.txt	Sun Sep 07 13:36:18 2008 +0000
+++ b/src/lang/english.txt	Sun Sep 07 16:22:55 2008 +0000
@@ -1881,6 +1881,7 @@
 STR_280A_SIGN                                                   :Sign
 STR_280B_EDIT_SIGN_TEXT                                         :{WHITE}Edit sign text
 STR_280C_CAN_T_CHANGE_SIGN_NAME                                 :{WHITE}Can't change sign name...
+STR_CAN_T_DELETE_SIGN                                           :{WHITE}Can't delete sign...
 STR_280D_SELECT_TREE_TYPE_TO_PLANT                              :{BLACK}Select tree type to plant
 STR_280E_TREES                                                  :Trees
 STR_280F_RAINFOREST                                             :Rainforest
diff -r 259601e31f79 -r 3159b77d3506 src/signs_gui.cpp
--- a/src/signs_gui.cpp	Sun Sep 07 13:36:18 2008 +0000
+++ b/src/signs_gui.cpp	Sun Sep 07 16:22:55 2008 +0000
@@ -22,6 +22,7 @@
 #include "viewport_func.h"
 #include "querystring_gui.h"
 #include "sortlist_type.h"
+#include "string_func.h"
 
 #include "table/strings.h"
 #include "table/sprites.h"
@@ -173,7 +174,7 @@
 static void RenameSign(SignID index, const char *text)
 {
 	_cmd_text = text;
-	DoCommandP(0, index, 0, NULL, CMD_RENAME_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)));
 }
 
 enum QueryEditSignWidgets {
@@ -343,7 +344,7 @@
 void HandleClickOnSign(const Sign *si)
 {
 	if (_ctrl_pressed && si->owner == _local_player) {
-		RenameSign(si->index, "");
+		RenameSign(si->index, NULL);
 		return;
 	}
 	ShowRenameSignWindow(si);