X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=b956f94489c05c571f11ceff58c27333a80ffa08;hb=59b7ace7dd899298869a0921c0b9137e233c196b;hp=ffd9c445ac7e4e80adf7ecec4c7ed28c73f95465;hpb=6bead4fda35db0cb9ec61309ee7cd9c99bb53475;p=xboard.git

diff --git a/backend.c b/backend.c
index ffd9c44..b956f94 100644
--- a/backend.c
+++ b/backend.c
@@ -6050,7 +6050,11 @@ SetCharTableEsc (unsigned char *table, const char * map, char * escapes)
                     int p;
                     for(p=0; p<EmptySquare; p++) if(table[p] == partner[i]) break;
                     if(c == '^') table[i] = '+';
-                    if(p < EmptySquare) promoPartner[p] = i, promoPartner[i] = p; // marry them
+                    if(p < EmptySquare) {
+                        if(promoPartner[promoPartner[p]] == p) promoPartner[promoPartner[p]] = promoPartner[p]; // divorce old partners
+                        if(promoPartner[promoPartner[i]] == i) promoPartner[promoPartner[i]] = promoPartner[i];
+                        promoPartner[p] = i, promoPartner[i] = p; // and marry this couple
+                    }
                 } else if(c == '*') {
                     table[i] = partner[i];
                     promoPartner[i] = (i < BlackPawn ? WhiteTokin : BlackTokin); // promotes to Tokin