提交: 7a44bacac555b6892eb18fb3985acb35b49f0316 - ffftp (git)

FFFTPのソースコードです。

Commit MetaInfo

• 修訂: 7a44bacac555b6892eb18fb3985acb35b49f0316 (tree)
• 時間: 2011-10-24 20:04:00
• 作者: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Fix bugs of resetting host on reconnecting.

Change Summary

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: connect.c

差異

Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ

Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ

--- a/connect.c
+++ b/connect.c
@@ -927,24 +927,15 @@ static void SaveCurrentSetToHistory(void)
 int ReConnectCmdSkt(void)
 {
 	int Sts;
-	SOCKET s;
 
 
 	// 同時接続対応
 //	if(CmdCtrlSocket != TrnCtrlSocket)
-//		do_closesocket(TrnCtrlSocket);
-//	TrnCtrlSocket = INVALID_SOCKET;
-	s = TrnCtrlSocket;
+	if(CmdCtrlSocket != TrnCtrlSocket && TrnCtrlSocket != INVALID_SOCKET)
+		do_closesocket(TrnCtrlSocket);
 	TrnCtrlSocket = INVALID_SOCKET;
-	if(CmdCtrlSocket != s && s != INVALID_SOCKET)
-		do_closesocket(s);
 
-	// 同時接続対応
-//	Sts = ReConnectSkt(&CmdCtrlSocket);
-	s = CmdCtrlSocket;
-	CmdCtrlSocket = INVALID_SOCKET;
-	Sts = ReConnectSkt(&s);
-	CmdCtrlSocket = s;
+	Sts = ReConnectSkt(&CmdCtrlSocket);
 
 	TrnCtrlSocket = CmdCtrlSocket;