svnno****@sourc*****
svnno****@sourc*****
2011年 6月 8日 (水) 21:04:57 JST
Tera TermRevision: 4490
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4490
Author: yutakapon
Date: 2011-06-08 21:04:57 +0900 (Wed, 08 Jun 2011)
Log Message:
-----------
SCPファイルé€ä¿¡ã®ã‚ャンセル処ç†ã«ãŠã„ã¦ã€ã‚¹ãƒ¬ãƒƒãƒ‰ã‚»ãƒ¼ãƒ•ã§ã¯ãªã„ ssh2_channel_send_close() ã‚’
呼ã°ãªã„よã†ã«ã—ãŸã€‚
Modified Paths:
--------------
trunk/ttssh2/ttxssh/ssh.c
-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c 2011-06-08 10:08:56 UTC (rev 4489)
+++ trunk/ttssh2/ttxssh/ssh.c 2011-06-08 12:04:57 UTC (rev 4490)
@@ -7461,8 +7461,12 @@
}
case IDCANCEL:
- EndDialog(hWnd, 0);
- DestroyWindow(hWnd);
+ // ƒEƒBƒ“ƒhƒE‚ð‚¢‚«‚È‚è”jŠü‚·‚é‚Ì‚Å‚Í‚È‚A”ñ•\Ž¦‚É‚·‚é‚Ì‚Ý‚Æ‚µ‚ÄA
+ // ƒXƒŒƒbƒh‚©‚ç‚̃ƒbƒZ[ƒW‚ðˆ—‚Å‚«‚é‚悤‚É‚·‚éB
+ // (2011.6.8 yutaka)
+ //EndDialog(hWnd, 0);
+ //DestroyWindow(hWnd);
+ ShowWindow(hWnd, SW_HIDE);
return TRUE;
default:
return FALSE;
@@ -7490,6 +7494,9 @@
// ƒEƒBƒ“ƒhƒE‚ªŒ©‚¦‚È‚‚È‚Á‚½‚çAƒLƒƒƒ“ƒZƒ‹‚³‚ꂽB
if (IsWindow(hd) == 0)
return 1;
+ // ƒEƒBƒ“ƒhƒE‚ª”ñ•\Ž¦‚Ìê‡AƒLƒƒƒ“ƒZƒ‹‚³‚ꂽB
+ if (IsWindowVisible(hd) == 0)
+ return 1;
return 0;
}
@@ -7604,7 +7611,12 @@
return 0;
cancel_abort:
- ssh2_channel_send_close(pvar, c);
+ // ƒ`ƒƒƒlƒ‹‚̃Nƒ[ƒY‚ðs‚¢‚½‚¢‚ªA’¼Ú ssh2_channel_send_close() ‚ðŒÄ‚Ño‚·‚ÆA
+ // “–ŠYŠÖ”‚ªƒXƒŒƒbƒhƒZ[ƒt‚Å‚Í‚È‚¢‚½‚ßASCPˆ—‚ª³í‚ÉI—¹‚µ‚È‚¢ê‡‚ª‚ ‚éB
+ // (2011.6.8 yutaka)
+ parm.c = c;
+ parm.pvar = pvar;
+ SendMessage(hWnd, WM_CHANNEL_CLOSE, (WPARAM)&parm, 0);
abort: