X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=439df1b2fc5662fdb16221ae551082ce323520d5;hb=9f1ba14a6895d33e1721a100c29996ed5b5e6d75;hp=ccebf786576fb6c7f2ebc303b828595c2e73cf5b;hpb=8bec087a08da8b78d787fa6844cda66dfa1fb576;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index ccebf78..439df1b 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -884,6 +884,8 @@ SetUserLogo()
 	    snprintf(oldUserName, MSG_SIZ, "logos\\%s.bmp", curName);
 		userLogo = LoadImage( 0, oldUserName, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE );	
 		safeStrCpy(oldUserName, curName, sizeof(oldUserName)/sizeof(oldUserName[0]) );
+		if(userLogo == NULL)
+		    userLogo = LoadImage( 0, "logos\\dummy.bmp", IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE );	
 	  }
     }
 }
@@ -4904,11 +4906,13 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       break;
 
     case IDM_EditGame:
+    case IDM_EditGame2:
       EditGameEvent();
       SAY("edit game");
       break;
 
     case IDM_EditPosition:
+    case IDM_EditPosition2:
       EditPositionEvent();
       SAY("enter a FEN string or setup a position on the board using the control R pop up menu");
       break;
@@ -4921,6 +4925,18 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       ShowGameListProc();
       break;
 
+    case IDM_EditProgs1:
+      EditTagsPopUp(firstChessProgramNames, &firstChessProgramNames);
+      break;
+
+    case IDM_EditProgs2:
+      EditTagsPopUp(secondChessProgramNames, &secondChessProgramNames);
+      break;
+
+    case IDM_EditServers:
+      EditTagsPopUp(icsNames, &icsNames);
+      break;
+
     case IDM_EditTags:
     case IDM_Tags:
       EditTagsProc();
@@ -7447,7 +7463,7 @@ DisplayAClock(HDC hdc, int timeRemaining, int highlight,
 	     rect, str, strlen(str), NULL);
   if(logoHeight > 0 && appData.clockMode) {
       RECT r;
-      snprintf(buf, sizeof(buf)/sizeof(buf[0]), "%s %s", buf+7, flagFell);
+      str += strlen(color)+2;
       r.top = rect->top + logoHeight/2;
       r.left = rect->left;
       r.right = rect->right;