Fix bugs of host switching.

diff --git a/FFFTP_Eng_Release/FFFTP.exe b/FFFTP_Eng_Release/FFFTP.exe
index dacaace..7662d1e 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 13deda2..097e2d4 100644 (file)
Binary files a/FFFTP_Eng_Release_64/FFFTP.exe and b/FFFTP_Eng_Release_64/FFFTP.exe differ

diff --git a/Package/make_update.bat b/Package/make_update.bat
index 5e7c69f..77384f0 100644 (file)
--- a/Package/make_update.bat
+++ b/Package/make_update.bat
@@ -11,8 +11,8 @@ set PREFIX_JPN=update.jpn.file.
 set PREFIX_ENG=update.eng.file.\r
 set PREFIX_AMD64_JPN=update.amd64.jpn.file.\r
 set PREFIX_AMD64_ENG=update.amd64.eng.file.\r
-set DESC_JPN="\93]\91\97\8e¸\94s\8e\9e\82É\8dÄ\90Ú\91±\82Å\82«\82È\82¢\8fê\8d\87\82ª\82 \82é\83o\83O\82ð\8fC\90³\82µ\82Ü\82µ\82½\81B\n\90Ø\92f\8e\9e\82É\83t\83@\83C\83\8b\82Ì\93]\91\97\91Ò\82¿\82ª\89ð\8f\9c\82³\82ê\82È\82¢\83o\83O\82ð\8fC\90³\82µ\82Ü\82µ\82½\81B\n\93]\91\97\92\86\82Ì\8b­\90§\8fI\97¹\82ª\8b@\94\\82µ\82È\82¢\8fê\8d\87\82ª\82 \82é\83o\83O\82ð\8fC\90³\82µ\82Ü\82µ\82½\81B\n\93]\91\97\92\86\82Ì\8b­\90§\8fI\97¹\82ª\8b@\94\\82µ\82È\82¢\8fê\8d\87\82ª\82 \82é\83o\83O\82ð\8fC\90³\82µ\82Ü\82µ\82½\81B\n\8eó\90M\92\86\8e~\82ð\83N\83\8a\83b\83N\82µ\82½\8cã\82Ì\8b\93\93®\82ª\82¨\82©\82µ\82­\82È\82é\83o\83O\82ð\8fC\90³\82µ\82Ü\82µ\82½\81B"\r
-set DESC_ENG="Fixed bugs that sometimes it cannot reconnect after transfer failure.\nFixed bugs that the queue of file transfer is not released on disconnection.\nFixed bugs that sometimes Force Exit does not work while transfer.\nFixed bugs that the behavior is strange after clicking Stop button."\r
+set DESC_JPN="\93¯\8e\9e\90Ú\91±\90\94\82ª1\82æ\82è\91å\82«\82¢\83z\83X\83g\82©\82ç\90Ø\92f\82µ\82½\92¼\8cã\82É\95Ê\82Ì\83z\83X\83g\82Å\93]\91\97\82É\8e¸\94s\82·\82é\83o\83O\82ð\8fC\90³\82µ\82Ü\82µ\82½\81B"\r
+set DESC_ENG="Fixed bugs that transfer fails at a host right after disconnection from another host whose number of simultaneous connections is more than 1."\r
 set DESC_AMD64_JPN=%DESC_JPN%\r
 set DESC_AMD64_ENG=%DESC_ENG%\r
 \r

diff --git a/Release/FFFTP.exe b/Release/FFFTP.exe
index 450dfe0..8504b20 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 8680c76..fe1f47e 100644 (file)
Binary files a/Release_64/FFFTP.exe and b/Release_64/FFFTP.exe differ

diff --git a/Resource/FFFTP.rc b/Resource/FFFTP.rc
index 7534951..624cfa1 100644 (file)
--- a/Resource/FFFTP.rc
+++ b/Resource/FFFTP.rc
@@ -242,7 +242,7 @@ FONT 9, "MS Shell Dlg", 0, 0, 0x0
 BEGIN\r
     DEFPUSHBUTTON   "OK",IDOK,133,294,50,14\r
     ICON            ffftp,-1,7,4,20,20\r
-    CTEXT           "FFFTP Ver 1.99a-20171028",-1,113,11,90,8\r
+    CTEXT           "FFFTP Ver 1.99a-20171029",-1,113,11,90,8\r
     CTEXT           "FFFTP\82Ífreeware\82Å\82·",-1,7,279,305,8\r
     CTEXT           "Copyright(C) 1997-2010 Sota & \82²\8b¦\97Í\82¢\82½\82¾\82¢\82½\95û\81X\nCopyright (C) 2011-2017 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, \82¤\82È\81[, Asami, fortran90, tomo1192, Yuji Tanaka, Moriguchi Hirokazu, \82Ó\82¤\82¹\82ñ)",-1,7,25,305,44,SS_NOPREFIX\r
     CTEXT           "",ABOUT_JRE,7,96,305,8\r
@@ -2213,8 +2213,8 @@ nodrop_csr              CURSOR                  "nodrop_c.cur"
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 1,99,1,17\r
- PRODUCTVERSION 1,99,1,17\r
+ FILEVERSION 1,99,1,18\r
+ PRODUCTVERSION 1,99,1,18\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -2232,12 +2232,12 @@ BEGIN
             VALUE "Comments", "\82±\82ê\82Í\83t\83\8a\81[\83\\83t\83g\83E\83G\83A\82Å\82·\81B"\r
             VALUE "CompanyName", "Sota, FFFTP Project"\r
             VALUE "FileDescription", "FFFTP"\r
-            VALUE "FileVersion", "1, 99, 1, 17"\r
+            VALUE "FileVersion", "1, 99, 1, 18"\r
             VALUE "InternalName", "FFFTP"\r
             VALUE "LegalCopyright", "Copyright (C) 1997-2010 Sota & \82²\8b¦\97Í\82¢\82½\82¾\82¢\82½\95û\81X\nCopyright (C) 2011-2017 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, \82¤\82È\81[, Asami, fortran90, tomo1192, Yuji Tanaka, Moriguchi Hirokazu, \82Ó\82¤\82¹\82ñ)."\r
             VALUE "OriginalFilename", "FFFTP.exe"\r
             VALUE "ProductName", "FFFTP"\r
-            VALUE "ProductVersion", "1, 99, 1, 17"\r
+            VALUE "ProductVersion", "1, 99, 1, 18"\r
         END\r
     END\r
     BLOCK "VarFileInfo"\r

diff --git a/Resource_eng/ffftp.rc b/Resource_eng/ffftp.rc
index 4c8929d..fbbc388 100644 (file)
--- a/Resource_eng/ffftp.rc
+++ b/Resource_eng/ffftp.rc
@@ -242,7 +242,7 @@ FONT 9, "MS Shell Dlg", 0, 0, 0x0
 BEGIN\r
     DEFPUSHBUTTON   "OK",IDOK,132,296,50,14\r
     ICON            ffftp,-1,7,4,20,20\r
-    CTEXT           "FFFTP Ver 1.99a-20171028",-1,110,11,90,8\r
+    CTEXT           "FFFTP Ver 1.99a-20171029",-1,110,11,90,8\r
     CTEXT           "FFFTP is freeware",-1,7,281,301,8\r
     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\r
     CTEXT           "",ABOUT_JRE,7,93,301,8\r
@@ -2253,8 +2253,8 @@ nodrop_csr              CURSOR                  "nodrop_c.cur"
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 1,99,1,17\r
- PRODUCTVERSION 1,99,1,17\r
+ FILEVERSION 1,99,1,18\r
+ PRODUCTVERSION 1,99,1,18\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -2272,12 +2272,12 @@ BEGIN
             VALUE "Comments", "This software is Free Software"\r
             VALUE "CompanyName", "Sota, FFFTP Project"\r
             VALUE "FileDescription", "FFFTP"\r
-            VALUE "FileVersion", "1, 99, 1, 17"\r
+            VALUE "FileVersion", "1, 99, 1, 18"\r
             VALUE "InternalName", "FFFTP"\r
             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)."\r
             VALUE "OriginalFilename", "FFFTP.exe"\r
             VALUE "ProductName", "FFFTP"\r
-            VALUE "ProductVersion", "1, 99, 1, 17"\r
+            VALUE "ProductVersion", "1, 99, 1, 18"\r
         END\r
     END\r
     BLOCK "VarFileInfo"\r

diff --git a/common.h b/common.h
index e977d3f..bb544c4 100644 (file)
--- a/common.h
+++ b/common.h
@@ -72,16 +72,16 @@
 //#define PROGRAM_VERSION_NUM          1972            /* バージョン */\r
 // 64ビット対応\r
 #ifdef _WIN64\r
-#define VER_STR                                        "1.99a-20171028 64bit"\r
+#define VER_STR                                        "1.99a-20171029 64bit"\r
 #else\r
-#define VER_STR                                        "1.99a-20171028"\r
+#define VER_STR                                        "1.99a-20171029"\r
 #endif\r
 #define VER_NUM                                        1990            /* 設定バージョン */\r
 #define PROGRAM_VERSION_NUM            1990            /* バージョン */\r
 // ソフトウェア自動更新\r
 // リリースバージョンはリリース予定年（10進数4桁）+月（2桁）+日（2桁）+通し番号（0スタート2桁）とする\r
 // 2014年7月31日中の30個目のリリースは2014073129\r
-#define RELEASE_VERSION_NUM            2017102800      /* リリースバージョン */\r
+#define RELEASE_VERSION_NUM            2017102900      /* リリースバージョン */\r
 \r
 \r
 // SourceForge.JPによるフォーク\r

diff --git a/getput.c b/getput.c
index 4b3141d..76f6eff 100644 (file)
--- a/getput.c
+++ b/getput.c
@@ -792,8 +792,7 @@ static ULONG WINAPI TransferThread(void *Dummy)
                }\r
                if(AskReuseCmdSkt() == YES && ThreadCount == 0)\r
                {\r
-                       if(TransPacketBase && ThreadCount < AskMaxThreadCount())\r
-                               TrnSkt = AskTrnCtrlSkt();\r
+                       TrnSkt = AskTrnCtrlSkt();\r
                        // セッションあたりの転送量制限対策\r
                        if(TrnSkt != INVALID_SOCKET && AskErrorReconnect() == YES && LastError == YES)\r
                        {\r
@@ -859,7 +858,7 @@ static ULONG WINAPI TransferThread(void *Dummy)
                                {\r
                                        // 同時ログイン数制限対策\r
                                        // 60秒間使用されなければログアウト\r
-                                       if(timeGetTime() - LastUsed > 60000 || AskConnecting() == NO)\r
+                                       if(timeGetTime() - LastUsed > 60000 || AskConnecting() == NO || ThreadCount >= AskMaxThreadCount())\r
                                        {\r
                                                ReleaseMutex(hListAccMutex);\r
                                                DoQUIT(TrnSkt, &Canceled[ThreadCount]);\r