Merge pull request #976 from TeraTermProject/fix/#975-IandVoption

ttermpro.exe の /I オプション指定時にマクロコマンド connect でホストに接続出来ない #975

Author: hkanou

doc/en/html/about/history.html

@@ -59,6 +59,11 @@ <h3 id="teraterm_5.6.0">YYYY.MM.DD (Ver 5.6.0 not released yet)</h3>
         Fixed an issue so that [File] - [Change directory...] can be selected even when the session is disconnected.
         (<a href="https://github.com/TeraTermProject/teraterm/issues/969" target="_blank">issue #969</a>)
       </li>
+      <li>
+        Fixed an issue where the window was not hidden when ttermpro.exe was launched with the /V option. (degradation at 5.4.1)<br>
+        Fixed an issue where the macro command "connect" failed to connect to the host when ttermpro.exe was launched with the /I option. (degradation at 5.4.1)
+        (<a href="https://github.com/TeraTermProject/teraterm/issues/975" target="_blank">issue #975</a>)
+      </li>
       <li>
         Fixed a bug that caused <a href="../setup/teraterm-trans.html#hidetransdialog">FTHideDialog</a> in TERATERM.INI to stop working.
         (<a href="https://github.com/TeraTermProject/teraterm/issues/967" target="_blank">issue #967</a>)

doc/ja/html/about/history.html

@@ -59,6 +59,11 @@ <h3 id="teraterm_5.6.0">YYYY.MM.DD (Ver 5.6.0 not released yet)</h3>
         セッション断の状態でも [File] - [Change directory...] を選択出来るよう修正した。
         (<a href="https://github.com/TeraTermProject/teraterm/issues/969" target="_blank">issue #969</a>)
       </li>
+      <li>
+        ttermpro.exe の /I オプション指定時にマクロコマンド connect でホストに接続出来ない不具合を修正した。（5.4.1でのデグレード）<br>
+        ttermpro.exe の /V オプション指定時にウインドウが非表示にならない不具合を修正した。（5.4.1でのデグレード）
+        (<a href="https://github.com/TeraTermProject/teraterm/issues/975" target="_blank">issue #975</a>)
+      </li>
       <li>
         TERATERM.INI の <a href="../setup/teraterm-trans.html#hidetransdialog">FTHideDialog</a> が機能しなくなっていた不具合を修正した。
         (<a href="https://github.com/TeraTermProject/teraterm/issues/967" target="_blank">issue #967</a>)

teraterm/teraterm/teraterm.cpp

@@ -374,11 +374,6 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPreInst,
 	pVTWin = m_pMainWnd;
 	main_window = m_pMainWnd->m_hWnd;
 
-	if (ts.Minimize>0) {
-		nCmdShow = SW_SHOWMINIMIZED;
-	}
-	ShowWindow(main_window, nCmdShow);
-
 	// [Tera Term]セクションのDLG_SYSTEM_FONTをとりあえずセットする
 	SetDialogFont(ts.DialogFontNameW, ts.DialogFontPoint, ts.DialogFontCharSet,
 				  ts.UILanguageFileW, "Tera Term", "DLG_SYSTEM_FONT");

teraterm/teraterm/vtwin.cpp

@@ -788,8 +788,7 @@ CVTWindow::CVTWindow(HINSTANCE hInstance)
 		TipWin->Create(HVTWin);
 	}
 
-	if (ts.nCmdShow == SW_HIDE || ts.nCmdShow == SW_SHOWMINIMIZED ||
-		ts.nCmdShow == SW_MINIMIZE || ts.HideWindow > 0) {
+	if (ts.nCmdShow == SW_HIDE || ts.HideWindow > 0) {
 		if (strlen(TopicName)>0) {
 			InitDDE();
 			SendDDEReady();
@@ -799,6 +798,11 @@ CVTWindow::CVTWindow(HINSTANCE hInstance)
 		return;
 	}
 	SetWindowAlpha(ts.AlphaBlendActive);
+	int CmdShow = ts.nCmdShow;
+	if (ts.Minimize > 0) {
+		CmdShow = SW_SHOWMINIMIZED;
+	}
+	ShowWindow(CmdShow);
 	ChangeCaret(vt_src);
 }