Fix bugs of dead locking.

diff --git a/FFFTP_Eng_Release/FFFTP.exe b/FFFTP_Eng_Release/FFFTP.exe
index f24144d..688a30b 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 b18db80..f37f02b 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 878f727..4636d57 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 123e18c..e804064 100644 (file)
Binary files a/Release_64/FFFTP.exe and b/Release_64/FFFTP.exe differ

diff --git a/common.h b/common.h
index f5de0db..082c948 100644 (file)
--- a/common.h
+++ b/common.h
@@ -81,7 +81,7 @@
 // ソフトウェア自動更新\r
 // リリースバージョンはリリース予定年（10進数4桁）+月（2桁）+日（2桁）+通し番号（0スタート2桁）とする\r
 // 2014年7月31日中の30個目のリリースは2014073129\r
-#define RELEASE_VERSION_NUM            2015113001      /* リリースバージョン */\r
+#define RELEASE_VERSION_NUM            2015113002      /* リリースバージョン */\r
 \r
 \r
 // SourceForge.JPによるフォーク\r

diff --git a/ftpproc.c b/ftpproc.c
index 384c332..13e5d2b 100644 (file)
--- a/ftpproc.c
+++ b/ftpproc.c
@@ -2384,28 +2384,43 @@ void DeleteProc(void)
        CancelFlg = NO;\r
 \r
        // デッドロック対策\r
-       DisableUserOpe();\r
-       Sts = YES;\r
-       AskRemoteCurDir(CurDir, FMAX_PATH);\r
-       FileListBase = NULL;\r
+//     Sts = YES;\r
+//     AskRemoteCurDir(CurDir, FMAX_PATH);\r
+//     FileListBase = NULL;\r
+//     if(GetFocus() == GetLocalHwnd())\r
+//     {\r
+//             Win = WIN_LOCAL;\r
+//             MakeSelectedFileList(Win, NO, NO, &FileListBase, &CancelFlg);\r
+//     }\r
+//     else\r
+//     {\r
+//             Win = WIN_REMOTE;\r
+//             if(CheckClosedAndReconnect() == FFFTP_SUCCESS)\r
+//                     MakeSelectedFileList(Win, YES, NO, &FileListBase, &CancelFlg);\r
+//             else\r
+//                     Sts = NO;\r
+//     }\r
+       Sts = FFFTP_SUCCESS;\r
        if(GetFocus() == GetLocalHwnd())\r
-       {\r
                Win = WIN_LOCAL;\r
-               MakeSelectedFileList(Win, NO, NO, &FileListBase, &CancelFlg);\r
-       }\r
        else\r
        {\r
                Win = WIN_REMOTE;\r
-               if(CheckClosedAndReconnect() == FFFTP_SUCCESS)\r
-                       MakeSelectedFileList(Win, YES, NO, &FileListBase, &CancelFlg);\r
-               else\r
-                       Sts = NO;\r
+               Sts = CheckClosedAndReconnect();\r
        }\r
 \r
-       if(Sts == YES)\r
+       // デッドロック対策\r
+//     if(Sts == YES)\r
+       if(Sts == FFFTP_SUCCESS)\r
        {\r
                // デッドロック対策\r
-//             DisableUserOpe();\r
+               DisableUserOpe();\r
+               AskRemoteCurDir(CurDir, FMAX_PATH);\r
+               FileListBase = NULL;\r
+               if(Win == WIN_LOCAL)\r
+                       MakeSelectedFileList(Win, NO, NO, &FileListBase, &CancelFlg);\r
+               else\r
+                       MakeSelectedFileList(Win, YES, NO, &FileListBase, &CancelFlg);\r
 \r
                DelFlg = NO;\r
                Sts = NO;\r
@@ -2442,10 +2457,8 @@ void DeleteProc(void)
                }\r
 \r
                // デッドロック対策\r
-//             EnableUserOpe();\r
+               EnableUserOpe();\r
        }\r
-       // デッドロック対策\r
-       EnableUserOpe();\r
        return;\r
 }\r
 \r