X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=5cf1712edc120436c82ee4382d5c70ebaadd4e32;hb=c6338f2b9f9b3191ab810791de54826faf01bc7f;hp=43dfeeda52bbb061b40d399347458a5c22b1e8c6;hpb=f0fa0b3b5570ba67f4a83101fe24f5504fb21012;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index 43dfeed..5cf1712 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -3394,6 +3394,48 @@ DrawLogoOnDC(HDC hdc, RECT logoRect, HBITMAP logo)
   DeleteDC(tmphdc);
 }
 
+VOID
+DisplayLogos()
+{
+  if(logoHeight) {
+	HDC hdc = GetDC(hwndMain);
+	HBITMAP whiteLogo = (HBITMAP) first.programLogo, blackLogo = (HBITMAP) second.programLogo;
+	if(appData.autoLogo) {
+	  
+	  switch(gameMode) { // pick logos based on game mode
+	    case IcsObserving:
+		whiteLogo = second.programLogo; // ICS logo
+		blackLogo = second.programLogo;
+	    default:
+		break;
+	    case IcsPlayingWhite:
+		if(!appData.zippyPlay) whiteLogo = userLogo;
+		blackLogo = second.programLogo; // ICS logo
+		break;
+	    case IcsPlayingBlack:
+		whiteLogo = second.programLogo; // ICS logo
+		blackLogo = appData.zippyPlay ? first.programLogo : userLogo;
+		break;
+	    case TwoMachinesPlay:
+	        if(first.twoMachinesColor[0] == 'b') {
+		    whiteLogo = second.programLogo;
+		    blackLogo = first.programLogo;
+		}
+		break;
+	    case MachinePlaysWhite:
+		blackLogo = userLogo;
+		break;
+	    case MachinePlaysBlack:
+		whiteLogo = userLogo;
+		blackLogo = first.programLogo;
+	  }
+	}
+	DrawLogoOnDC(hdc, leftLogoRect, flipClock ? blackLogo : whiteLogo);
+	DrawLogoOnDC(hdc, rightLogoRect, flipClock ? whiteLogo : blackLogo);
+	ReleaseDC(hwndMain, hdc);
+  }
+}
+
 static HDC hdcSeek;
 
 // [HGM] seekgraph
@@ -3732,41 +3774,6 @@ HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)
 	}
     }
   }
-  if(logoHeight) {
-	HBITMAP whiteLogo = (HBITMAP) first.programLogo, blackLogo = (HBITMAP) second.programLogo;
-	if(appData.autoLogo) {
-	  
-	  switch(gameMode) { // pick logos based on game mode
-	    case IcsObserving:
-		whiteLogo = second.programLogo; // ICS logo
-		blackLogo = second.programLogo;
-	    default:
-		break;
-	    case IcsPlayingWhite:
-		if(!appData.zippyPlay) whiteLogo = userLogo;
-		blackLogo = second.programLogo; // ICS logo
-		break;
-	    case IcsPlayingBlack:
-		whiteLogo = second.programLogo; // ICS logo
-		blackLogo = appData.zippyPlay ? first.programLogo : userLogo;
-		break;
-	    case TwoMachinesPlay:
-	        if(first.twoMachinesColor[0] == 'b') {
-		    whiteLogo = second.programLogo;
-		    blackLogo = first.programLogo;
-		}
-		break;
-	    case MachinePlaysWhite:
-		blackLogo = userLogo;
-		break;
-	    case MachinePlaysBlack:
-		whiteLogo = userLogo;
-		blackLogo = first.programLogo;
-	  }
-	}
-	DrawLogoOnDC(hdc, leftLogoRect, flipClock ? blackLogo : whiteLogo);
-	DrawLogoOnDC(hdc, rightLogoRect, flipClock ? whiteLogo : blackLogo);
-  }
 
   if( appData.highlightMoveWithArrow ) {
     DrawArrowHighlight(hdcmem);
@@ -3981,6 +3988,7 @@ PaintProc(HWND hwnd)
 		 &messageRect, messageText, strlen(messageText), NULL);
       SelectObject(hdc, oldFont);
       DisplayBothClocks();
+      DisplayLogos();
     }
     EndPaint(hwnd,&ps);
   }
@@ -4847,6 +4855,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       matchMode = 2;// distinguish from command-line-triggered case (matchMode=1)
       appData.matchGames = appData.defaultMatchGames;
       matchGame = 1;
+      first.matchWins = second.matchWins = 0;
 
     case IDM_TwoMachines:
       TwoMachinesEvent();
@@ -5067,7 +5076,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
     case IDM_FlipClock:
       flipClock = !flipClock;
       DisplayBothClocks();
-      DrawPosition(FALSE, NULL);
+      DisplayLogos();
       break;
 
     case IDM_MuteSounds:
@@ -8019,6 +8028,7 @@ ModeHighlight()
                        MF_BYCOMMAND|MF_UNCHECKED);
        }
   }
+  DisplayLogos(); // [HGM] logos: mode change could have altered logos
 }
 
 VOID