• R/O
  • HTTP
  • SSH
  • HTTPS

コミット

よく使われているワード(クリックで追加)

javac++androidlinuxc#objective-cqtwindows誰得cocoapythonphprubygameguibathyscaphec翻訳omegat計画中(planning stage)frameworktwittertestdomvb.netdirectxbtronarduinopreviewerゲームエンジン

Loweynet


コミットメタ情報

リビジョンea2078360ebe7fcb9d0335ff815da6f6852de641 (tree)
日時2017-10-28 22:11:13
作者s_kawamoto <s_kawamoto@user...>
コミッターs_kawamoto

ログメッセージ

Fix bugs of error recovery routine.

変更サマリ

差分

Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ
Binary files a/FFFTP_Eng_Release_64/FFFTP.exe and b/FFFTP_Eng_Release_64/FFFTP.exe differ
Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ
Binary files a/Release_64/FFFTP.exe and b/Release_64/FFFTP.exe differ
--- a/Resource/FFFTP.rc
+++ b/Resource/FFFTP.rc
@@ -242,7 +242,7 @@ FONT 9, "MS Shell Dlg", 0, 0, 0x0
242242 BEGIN
243243 DEFPUSHBUTTON "OK",IDOK,133,294,50,14
244244 ICON ffftp,-1,7,4,20,20
245- CTEXT "FFFTP Ver 1.99a-20170924",-1,113,11,90,8
245+ CTEXT "FFFTP Ver 1.99a-20171028",-1,113,11,90,8
246246 CTEXT "FFFTP‚Ífreeware‚Å‚·",-1,7,279,305,8
247247 CTEXT "Copyright(C) 1997-2010 Sota & ‚²‹¦—Í‚¢‚½‚¾‚¢‚½•ûX\nCopyright (C) 2011-2017 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, ‚¤‚ȁ[, Asami, fortran90, tomo1192, Yuji Tanaka, Moriguchi Hirokazu, ‚Ó‚¤‚¹‚ñ)",-1,7,25,305,44,SS_NOPREFIX
248248 CTEXT "",ABOUT_JRE,7,96,305,8
@@ -2213,8 +2213,8 @@ nodrop_csr CURSOR "nodrop_c.cur"
22132213 //
22142214
22152215 VS_VERSION_INFO VERSIONINFO
2216- FILEVERSION 1,99,1,16
2217- PRODUCTVERSION 1,99,1,16
2216+ FILEVERSION 1,99,1,17
2217+ PRODUCTVERSION 1,99,1,17
22182218 FILEFLAGSMASK 0x3fL
22192219 #ifdef _DEBUG
22202220 FILEFLAGS 0x1L
@@ -2232,12 +2232,12 @@ BEGIN
22322232 VALUE "Comments", "‚±‚ê‚̓tƒŠ[ƒ\ƒtƒgƒEƒGƒA‚Å‚·B"
22332233 VALUE "CompanyName", "Sota, FFFTP Project"
22342234 VALUE "FileDescription", "FFFTP"
2235- VALUE "FileVersion", "1, 99, 1, 16"
2235+ VALUE "FileVersion", "1, 99, 1, 17"
22362236 VALUE "InternalName", "FFFTP"
22372237 VALUE "LegalCopyright", "Copyright (C) 1997-2010 Sota & ‚²‹¦—Í‚¢‚½‚¾‚¢‚½•ûX\nCopyright (C) 2011-2017 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, ‚¤‚ȁ[, Asami, fortran90, tomo1192, Yuji Tanaka, Moriguchi Hirokazu, ‚Ó‚¤‚¹‚ñ)."
22382238 VALUE "OriginalFilename", "FFFTP.exe"
22392239 VALUE "ProductName", "FFFTP"
2240- VALUE "ProductVersion", "1, 99, 1, 16"
2240+ VALUE "ProductVersion", "1, 99, 1, 17"
22412241 END
22422242 END
22432243 BLOCK "VarFileInfo"
--- a/Resource_eng/ffftp.rc
+++ b/Resource_eng/ffftp.rc
@@ -242,7 +242,7 @@ FONT 9, "MS Shell Dlg", 0, 0, 0x0
242242 BEGIN
243243 DEFPUSHBUTTON "OK",IDOK,132,296,50,14
244244 ICON ffftp,-1,7,4,20,20
245- CTEXT "FFFTP Ver 1.99a-20170924",-1,110,11,90,8
245+ CTEXT "FFFTP Ver 1.99a-20171028",-1,110,11,90,8
246246 CTEXT "FFFTP is freeware",-1,7,281,301,8
247247 CTEXT "Copyright(C) 1997-2010 Sota && cooperators\nCopyright (C) 2011-2017 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, unarist, Asami, fortran90, tomo1192, Yuji Tanaka, Moriguchi Hirokazu, Fu-sen)",-1,7,25,301,44
248248 CTEXT "",ABOUT_JRE,7,93,301,8
@@ -2253,8 +2253,8 @@ nodrop_csr CURSOR "nodrop_c.cur"
22532253 //
22542254
22552255 VS_VERSION_INFO VERSIONINFO
2256- FILEVERSION 1,99,1,16
2257- PRODUCTVERSION 1,99,1,16
2256+ FILEVERSION 1,99,1,17
2257+ PRODUCTVERSION 1,99,1,17
22582258 FILEFLAGSMASK 0x3fL
22592259 #ifdef _DEBUG
22602260 FILEFLAGS 0x1L
@@ -2272,12 +2272,12 @@ BEGIN
22722272 VALUE "Comments", "This software is Free Software"
22732273 VALUE "CompanyName", "Sota, FFFTP Project"
22742274 VALUE "FileDescription", "FFFTP"
2275- VALUE "FileVersion", "1, 99, 1, 16"
2275+ VALUE "FileVersion", "1, 99, 1, 17"
22762276 VALUE "InternalName", "FFFTP"
22772277 VALUE "LegalCopyright", "Copyright (C) 1997-2010 Sota & cooperators\nCopyright (C) 2011-2017 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, unarist, Asami, fortran90, tomo1192, Yuji Tanaka, Moriguchi Hirokazu, Fu-sen)."
22782278 VALUE "OriginalFilename", "FFFTP.exe"
22792279 VALUE "ProductName", "FFFTP"
2280- VALUE "ProductVersion", "1, 99, 1, 16"
2280+ VALUE "ProductVersion", "1, 99, 1, 17"
22812281 END
22822282 END
22832283 BLOCK "VarFileInfo"
--- a/ftpproc.c
+++ b/ftpproc.c
@@ -3867,11 +3867,12 @@ static int RenameUnuseableName(char *Fname)
38673867 // NOOPコマンドでは効果が無いホストが多いためLISTコマンドを使用
38683868 void NoopProc(int Force)
38693869 {
3870-// CancelFlg = NO;
38713870 if(Force == YES || (AskConnecting() == YES && AskUserOpeDisabled() == NO))
38723871 {
3873- if(AskReuseCmdSkt() == NO || AskShareProh() == YES || AskTransferNow() == NO)
3872+ if(AskReuseCmdSkt() == NO || (AskShareProh() == YES && AskTransferNow() == NO))
38743873 {
3874+ if(Force == NO)
3875+ CancelFlg = NO;
38753876 DisableUserOpe();
38763877 DoDirListCmdSkt("", "", 999, &CancelFlg);
38773878 EnableUserOpe();
@@ -3884,9 +3885,9 @@ void AbortRecoveryProc(void)
38843885 {
38853886 if(AskConnecting() == YES && AskUserOpeDisabled() == NO)
38863887 {
3887- CancelFlg = NO;
38883888 if(AskReuseCmdSkt() == NO || AskShareProh() == YES || AskTransferNow() == NO)
38893889 {
3890+ CancelFlg = NO;
38903891 if(AskErrorReconnect() == YES)
38913892 {
38923893 DisableUserOpe();
--- a/main.c
+++ b/main.c
@@ -1166,6 +1166,8 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
11661166 }
11671167 }
11681168 }
1169+ if(CancelFlg == YES)
1170+ AbortRecoveryProc();
11691171 if(NoopEnable == YES && AskNoopInterval() > 0 && time(NULL) - LastDataConnectionTime >= AskNoopInterval())
11701172 {
11711173 NoopProc(NO);