提交: 1c25e2b21eab24d2267f6e565c44dfc4e618350e - ffftp (git)

Loweynet

Commit MetaInfo

• 修订版: 1c25e2b21eab24d2267f6e565c44dfc4e618350e (tree)
• 时间: 2014-11-02 11:26:40
• 作者: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Fix bugs of error handling for file transfer.

更改概述

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: FFFTP_Eng_Release_64/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: Release_64/FFFTP.exe
• modified: ftpproc.c
• modified: main.c

差异

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/ftpproc.c
+++ b/ftpproc.c
@@ -3791,17 +3791,20 @@ void NoopProc(int Force)
 void AbortRecoveryProc(void)
 {
 	CancelFlg = NO;
-	if(AskReuseCmdSkt() == NO || AskShareProh() == YES || AskTransferNow() == NO)
+	if(AskConnecting() == YES && AskUserOpeDisabled() == NO)
 	{
-		if(AskErrorReconnect() == YES)
+		if(AskReuseCmdSkt() == NO || AskShareProh() == YES || AskTransferNow() == NO)
 		{
-			DisableUserOpe();
-			ReConnectCmdSkt();
-			GetRemoteDirForWnd(CACHE_REFRESH, &CancelFlg);
-			EnableUserOpe();
+			if(AskErrorReconnect() == YES)
+			{
+				DisableUserOpe();
+					ReConnectCmdSkt();
+				GetRemoteDirForWnd(CACHE_REFRESH, &CancelFlg);
+				EnableUserOpe();
+			}
+			else
+				RemoveReceivedData(AskCmdCtrlSkt());
 		}
-		else
-			RemoveReceivedData(AskCmdCtrlSkt());
 	}
 	return;
 }

--- a/main.c
+++ b/main.c
@@ -1167,7 +1167,7 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
 		case WM_COMMAND :
 			// 同時接続対応
 			// 中断後に受信バッファに応答が残っていると次のコマンドの応答が正しく処理できない
-			if(AskUserOpeDisabled() == NO && CancelFlg == YES)
+			if(CancelFlg == YES)
 				AbortRecoveryProc();
 			switch(LOWORD(wParam))
 			{