X-Git-Url: http://git.pond.sub.org/?p=empserver;a=blobdiff_plain;f=src%2Flib%2Fsubs%2Fnatsub.c;h=d5777f202944704e8c5040f591e39cc24661362c;hp=17da9c8fa3c0f83bf405e530e355f9150f6c5f2d;hb=062c660e28a50b72a2ec7b161264879dac85d219;hpb=9b2e906ea1c330c14be1d64bc714c174527d9132

diff --git a/src/lib/subs/natsub.c b/src/lib/subs/natsub.c
index 17da9c8fa..d5777f202 100644
--- a/src/lib/subs/natsub.c
+++ b/src/lib/subs/natsub.c
@@ -27,7 +27,7 @@
  *  nat.c: Nation subroutines
  *
  *  Known contributors to this file:
- *     Markus Armbruster, 2009
+ *     Markus Armbruster, 2009-2011
  *     Ron Koenderink, 2008-2009
  */
 
@@ -117,7 +117,7 @@ nat_reset(struct natstr *natp, enum nat_status stat, coord x, coord y)
 }
 
 int
-check_nat_name(char *cname)
+check_nat_name(char *cname, natid cnum)
 {
     struct natstr *natp;
     natid cn;
@@ -143,7 +143,7 @@ check_nat_name(char *cname)
     }
 
     for (cn = 0; NULL != (natp = getnatp(cn)); cn++) {
-	if (!strcmp(cname, natp->nat_cnam)) {
+	if (cn != cnum && !strcmp(cname, natp->nat_cnam)) {
 	    pr("Country #%d is already called `%s'\n", cn, cname);
 	    return 0;
 	}