X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwgamelist.c;h=26c843be2b508e7a408d9f82f0f92dafc7081d8b;hb=4d057f1c54f1904fc7e01828b5896c2a979d15ea;hp=2fa15333af1f05a20ca6358c7026409a49a8e30d;hpb=d7ba1f9301bde533d4eaf67586922a7b7ab30ce8;p=xboard.git

diff --git a/winboard/wgamelist.c b/winboard/wgamelist.c
index 2fa1533..26c843b 100644
--- a/winboard/wgamelist.c
+++ b/winboard/wgamelist.c
@@ -420,6 +420,7 @@ GameListDialog(HWND hDlg, UINT message,	WPARAM wParam, LPARAM lParam)
             CmailLoadGame(gameFile, nItem + 1, gameFileName, TRUE);
         }
         else {
+	    SetFocus(hwndMain); // [HGM] automatic focus switch
             LoadGame(gameFile, nItem + 1, gameFileName, TRUE);
         }
     }
@@ -446,6 +447,7 @@ VOID GameListPopUp(FILE *fp, char *filename)
   if (gameListDialog) {
     SendMessage(gameListDialog, WM_INITDIALOG, 0, 0);
     if (!gameListUp) ShowWindow(gameListDialog, SW_SHOW);
+    else SetFocus(gameListDialog);
   } else {
     lpProc = MakeProcInstance((FARPROC)GameListDialog, hInst);
     CreateDialog(hInst, MAKEINTRESOURCE(DLG_GameList),
@@ -483,7 +485,8 @@ VOID GameListDestroy()
 VOID ShowGameListProc()
 {
   if (gameListUp) {
-    GameListPopDown();
+    if(gameListDialog) SetFocus(gameListDialog);
+//    GameListPopDown();
   } else {
     if (gameFileName) {
       GameListPopUp(gameFile, gameFileName);