Fix bugs of drag-and-drop handling.

diff --git a/FFFTP_Eng_Release/FFFTP.exe b/FFFTP_Eng_Release/FFFTP.exe
index 68bea7a..334d83d 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 e550cfb..b69b2d7 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 d3ad4ab..145d1b8 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 dc64807..702e987 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 c6bc37a..27532b3 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            2015112901      /* リリースバージョン */\r
+#define RELEASE_VERSION_NUM            2015113000      /* リリースバージョン */\r
 \r
 \r
 // SourceForge.JPによるフォーク\r

diff --git a/filelist.c b/filelist.c
index 591ddd6..e068e59 100755 (executable)
--- a/filelist.c
+++ b/filelist.c
@@ -136,6 +136,8 @@ extern HWND hHelpWin;
 extern int SuppressRefresh;\r
 // ローカル側自動更新\r
 extern HANDLE ChangeNotification;\r
+// 特定の操作を行うと異常終了するバグ修正\r
+extern int CancelFlg;\r
 \r
 /* 設定値 */\r
 extern int LocalWidth;\r
@@ -478,7 +480,8 @@ static BOOL CALLBACK doOleDlgProc(HWND hDlg, UINT msg, WPARAM wp, LPARAM lp)
 static void doTransferRemoteFile(void)\r
 {\r
        FILELIST *FileListBase, *FileListBaseNoExpand, *pf;\r
-       int CancelFlg = NO;\r
+       // 特定の操作を行うと異常終了するバグ修正\r
+//     int CancelFlg = NO;\r
        char LocDir[FMAX_PATH+1];\r
        char TmpDir[FMAX_PATH+1];\r
        // 環境依存の不具合対策\r
@@ -909,13 +912,18 @@ static LRESULT FileListCommonWndProc(HWND hWnd, UINT message, WPARAM wParam, LPA
                                        int i, j, filenum = 0;\r
  \r
                                        FILELIST *FileListBase, *FileListBaseNoExpand, *pf;\r
-                                       int CancelFlg = NO;\r
+                                       // 特定の操作を行うと異常終了するバグ修正\r
+//                                     int CancelFlg = NO;\r
                                        char LocDir[FMAX_PATH+1];\r
                                        char *PathDir;\r
 \r
                                        // 特定の操作を行うと異常終了するバグ修正\r
+                                       GetCursorPos(&Point);\r
+                                       hWndPnt = WindowFromPoint(Point);\r
+                                       hWndParent = GetParent(hWndPnt);\r
                                        DisableUserOpe();\r
                                        Dragging = NO;\r
+                                       CancelFlg = NO;\r
 \r
                                        // 変数が未初期化のバグ修正\r
                                        FileListBaseNoExpand = NULL;\r
@@ -931,9 +939,10 @@ static LRESULT FileListCommonWndProc(HWND hWnd, UINT message, WPARAM wParam, LPA
                                                FileListBaseNoExpand = FileListBase;\r
  \r
                                        } else if (hWndDragStart == hWndListRemote) {\r
-                                               GetCursorPos(&Point);\r
-                                               hWndPnt = WindowFromPoint(Point);\r
-                                               hWndParent = GetParent(hWndPnt);\r
+                                               // 特定の操作を行うと異常終了するバグ修正\r
+//                                             GetCursorPos(&Point);\r
+//                                             hWndPnt = WindowFromPoint(Point);\r
+//                                             hWndParent = GetParent(hWndPnt);\r
                                                if (hWndPnt == hWndListRemote || hWndPnt == hWndListLocal ||\r
                                                        hWndParent == hWndListRemote || hWndParent == hWndListLocal) {\r
                                                        FileListBase = NULL;\r

diff --git a/ftpproc.c b/ftpproc.c
index 2aa7074..384c332 100644 (file)
--- a/ftpproc.c
+++ b/ftpproc.c
@@ -3824,7 +3824,7 @@ void AbortRecoveryProc(void)
                        if(AskErrorReconnect() == YES)\r
                        {\r
                                DisableUserOpe();\r
-                                       ReConnectCmdSkt();\r
+                               ReConnectCmdSkt();\r
                                GetRemoteDirForWnd(CACHE_REFRESH, &CancelFlg);\r
                                EnableUserOpe();\r
                        }\r