Fix bugs of error handling for file transfer.

diff --git a/FFFTP_Eng_Release/FFFTP.exe b/FFFTP_Eng_Release/FFFTP.exe
index 0dc109f..ce2f85a 100644 (file)
Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ

diff --git a/FFFTP_Eng_Release_64/FFFTP.exe b/FFFTP_Eng_Release_64/FFFTP.exe
index aed2bd3..6e1d684 100644 (file)
Binary files a/FFFTP_Eng_Release_64/FFFTP.exe and b/FFFTP_Eng_Release_64/FFFTP.exe differ

diff --git a/Release/FFFTP.exe b/Release/FFFTP.exe
index f18eae4..b003581 100644 (file)
Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ

diff --git a/Release_64/FFFTP.exe b/Release_64/FFFTP.exe
index 3ca9ade..236fedd 100644 (file)
Binary files a/Release_64/FFFTP.exe and b/Release_64/FFFTP.exe differ

diff --git a/ftpproc.c b/ftpproc.c
index 70db171..383c462 100644 (file)
--- a/ftpproc.c
+++ b/ftpproc.c
@@ -3791,17 +3791,20 @@ void NoopProc(int Force)
 void AbortRecoveryProc(void)\r
 {\r
        CancelFlg = NO;\r
-       if(AskReuseCmdSkt() == NO || AskShareProh() == YES || AskTransferNow() == NO)\r
+       if(AskConnecting() == YES && AskUserOpeDisabled() == NO)\r
        {\r
-               if(AskErrorReconnect() == YES)\r
+               if(AskReuseCmdSkt() == NO || AskShareProh() == YES || AskTransferNow() == NO)\r
                {\r
-                       DisableUserOpe();\r
-                       ReConnectCmdSkt();\r
-                       GetRemoteDirForWnd(CACHE_REFRESH, &CancelFlg);\r
-                       EnableUserOpe();\r
+                       if(AskErrorReconnect() == YES)\r
+                       {\r
+                               DisableUserOpe();\r
+                                       ReConnectCmdSkt();\r
+                               GetRemoteDirForWnd(CACHE_REFRESH, &CancelFlg);\r
+                               EnableUserOpe();\r
+                       }\r
+                       else\r
+                               RemoveReceivedData(AskCmdCtrlSkt());\r
                }\r
-               else\r
-                       RemoveReceivedData(AskCmdCtrlSkt());\r
        }\r
        return;\r
 }\r

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