X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwgamelist.c;h=5e3398963d3210fd4d67f30703696f395ea42c7c;hb=566205d159a20e4f86b54f5f2398b401df73d2e8;hp=2fa15333af1f05a20ca6358c7026409a49a8e30d;hpb=bb1c4f8ed2489e4891fe044532a35107d33174d2;p=xboard.git

diff --git a/winboard/wgamelist.c b/winboard/wgamelist.c
index 2fa1533..5e33989 100644
--- a/winboard/wgamelist.c
+++ b/winboard/wgamelist.c
@@ -1,7 +1,7 @@
 /*
  * wgamelist.c -- Game list window for WinBoard
  *
- * Copyright 1995,2009 Free Software Foundation, Inc.
+ * Copyright 1995, 2009, 2010 Free Software Foundation, Inc.
  *
  * Enhancements Copyright 2005 Alessandro Scotti
  *
@@ -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);