X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwclipbrd.c;h=f13e77f2b9b2ec43a1146883885eb4670cac4e39;hb=24f3259ce1a69c28c67f8e29eb32a18e43ab7f8c;hp=4d0fac9d11b92a67ae15d390896ef693c8b12fc5;hpb=bb1c4f8ed2489e4891fe044532a35107d33174d2;p=xboard.git

diff --git a/winboard/wclipbrd.c b/winboard/wclipbrd.c
index 4d0fac9..f13e77f 100644
--- a/winboard/wclipbrd.c
+++ b/winboard/wclipbrd.c
@@ -32,9 +32,9 @@
 #include <sys/stat.h>
 
 #include "common.h"
-#include "winboard.h"
 #include "frontend.h"
 #include "backend.h"
+#include "winboard.h"
 #include "wclipbrd.h"
 
 /* Imports from winboard.c */
@@ -50,6 +50,7 @@ CopyFENToClipboard()
 {
   char *fen = NULL;
 
+  if(gameMode == EditPosition) EditPositionDone(TRUE); // [HGM] mak sure castling rights are set consistently
   fen = PositionToFEN(currentMove, NULL);
   if (!fen) {
     DisplayError("Unable to convert position to FEN.", 0);
@@ -300,17 +301,8 @@ VOID PasteGameOrFENFromClipboard()
     return;
   }
 
-#if 0
-  tmp = buf;
-  while( *tmp == ' ' || *tmp == '\t' || *tmp == '\r' || *tmp == '\n' ) {
-      tmp++;
-  }
-
-  if( *tmp == '[' ) {
-#else
   // [HGM] paste any: make still smarter, to allow pasting of games without tags, recognize FEN in stead
   if(!ParseFEN(dummyBoard, &dummy, buf) ) {
-#endif
       PasteGameFromString( buf );
   }
   else {
@@ -358,15 +350,11 @@ PasteTextFromClipboard(char **text)
     fprintf(debugFP, "PasteTextFromClipboard(): lock count %d\n", lockCount);
   }
   SetLastError(NO_ERROR);
-#if 1
   /*suggested by Wilkin Ng*/
   lockCount = GlobalFlags(hClipMem) & GMEM_LOCKCOUNT;
   if (lockCount) {
     locked = GlobalUnlock(hClipMem);
   }
-#else
-  locked = GlobalUnlock(hClipMem);
-#endif
   err = GetLastError();
   if (appData.debugMode) {
     lockCount = GlobalFlags(hClipMem) & GMEM_LOCKCOUNT;