X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=a06361f981914e485ccf9d730a1eaac69ddafd00;hb=c3790f0d51cada3077e31626098a0de1f7c52df3;hp=034e5984d20e00889df8b750810d6fe99f311ea4;hpb=8fb84afc304e4d46a4dd73ed337fb17689545938;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index 034e598..a06361f 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -587,7 +587,7 @@ InitInstance(HINSTANCE hInstance, int nCmdShow, LPSTR lpCmdLine)
     InitDrawingSizes((BoardSize)ibs, 0);
     if (boardSize == (BoardSize)-1 &&
 	winHeight <= screenHeight && winWidth <= screenWidth) {
-      boardSize = (BoardSize)ibs;
+      boardSize = (BoardSize)ibs - 4 < 0 ? (BoardSize)0 : (BoardSize)ibs - 4;
     }
   }
   InitDrawingSizes(boardSize, 0);
@@ -3652,7 +3652,6 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 			if (appData.icsEngineAnalyze) {
 				if (appData.debugMode) 
 					fprintf(debugFP, "Found unexpected active ICS engine analyze \n");
-				appData.icsEngineAnalyze = FALSE;
 				ExitAnalyzeMode();
 				ModeHighlight();
 				break;
@@ -3661,7 +3660,6 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 		} else {
 			/* if enable, user want disable icsEngineAnalyze */
 			if (appData.icsEngineAnalyze) {
-				appData.icsEngineAnalyze = FALSE;
 				ExitAnalyzeMode();
 				ModeHighlight();
 				break;
@@ -5627,6 +5625,23 @@ ConsoleWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       wp.rcNormalPosition.bottom = consoleY + consoleH;
       SetWindowPlacement(hDlg, &wp);
     }
+    else { /* Determine Defaults */
+      WINDOWPLACEMENT wp;
+      consoleX = winWidth + 1;
+      consoleY = boardY;
+      consoleW = screenWidth -  winWidth;
+      consoleH = winHeight;
+      EnsureOnScreen(&consoleX, &consoleY);
+      wp.length = sizeof(WINDOWPLACEMENT);
+      wp.flags = 0;
+      wp.showCmd = SW_SHOW;
+      wp.ptMaxPosition.x = wp.ptMaxPosition.y = 0;
+      wp.rcNormalPosition.left = consoleX;
+      wp.rcNormalPosition.right = consoleX + consoleW;
+      wp.rcNormalPosition.top = consoleY;
+      wp.rcNormalPosition.bottom = consoleY + consoleH;
+      SetWindowPlacement(hDlg, &wp);
+    }
     return FALSE;
 
   case WM_SETFOCUS:
@@ -7614,6 +7629,12 @@ AnalysisDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
   case WM_COMMAND: /* message: received a command */
     switch (LOWORD(wParam)) {
     case IDCANCEL:
+	   /* icsEngineAnalyze */
+	   if (appData.icsActive && appData.icsEngineAnalyze) {
+		   ExitAnalyzeMode();
+		   ModeHighlight();
+		   return TRUE;
+	   }
       EditGameEvent();
       return TRUE;
     default: