Fix bugs of option dialog.

diff --git a/FFFTP_Eng_Release/FFFTP.exe b/FFFTP_Eng_Release/FFFTP.exe
index fd7577b..4fd66c8 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 7ae5a39..dccf0ce 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 d8dfcb0..29ed893 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 4dfe98e..2c617c5 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 0307012..d1e1711 100644 (file)
--- a/Resource/FFFTP.rc
+++ b/Resource/FFFTP.rc
@@ -973,7 +973,7 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,94,196,10\r
     CONTROL         "\90Ø\92f\8e\9e\82ÉQUIT\83R\83}\83\93\83h\82ð\91\97\82é(&Q)",CONNECT_SENDQUIT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,108,173,10\r
     CONTROL         "RAS\82Ì\90§\8cä\82ð\8ds\82í\82È\82¢(&R)",CONNECT_NORAS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,122,173,10\r
-    CONTROL         "\94ñPASV\83\82\81[\83h\8e\9e\82ÉUPnP\82ð\90§\8cä\82ð\8e\8e\8ds\82·\82é(&U)",CONNECT_UPNP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,136,173,10\r
+    CONTROL         "\94ñPASV\83\82\81[\83h\8e\9e\82ÉUPnP\82Ì\90§\8cä\82ð\8e\8e\8ds\82·\82é(&U)",CONNECT_UPNP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,136,173,10\r
 END\r
 \r
 rasnotify_dlg DIALOG  0, 0, 158, 46\r

diff --git a/common.h b/common.h
index 5bb7c19..b63e510 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            2015103001      /* リリースバージョン */\r
+#define RELEASE_VERSION_NUM            2015112900      /* リリースバージョン */\r
 \r
 \r
 // SourceForge.JPによるフォーク\r

diff --git a/option.c b/option.c
index 8f74fe0..ad6545c 100644 (file)
--- a/option.c
+++ b/option.c
@@ -1012,6 +1012,7 @@ static INT_PTR CALLBACK MirrorSettingProc(HWND hDlg, UINT message, WPARAM wParam
                        SetMultiTextToList(hDlg, MIRROR_NODEL_LIST, MirrorNoDel);\r
                        SendDlgItemMessage(hDlg, MIRROR_LOW, BM_SETCHECK, MirrorFnameCnv, 0);\r
                        SendDlgItemMessage(hDlg, MIRROR_UPDEL_NOTIFY, BM_SETCHECK, MirUpDelNotify, 0);\r
+                       SendDlgItemMessage(hDlg, MIRROR_DOWNDEL_NOTIFY, BM_SETCHECK, MirDownDelNotify, 0);\r
                        // ミラーリング設定追加\r
                        SendDlgItemMessage(hDlg, MIRROR_NO_TRANSFER, BM_SETCHECK, MirrorNoTransferContents, 0);\r
                    return(TRUE);\r
@@ -1349,8 +1350,7 @@ static INT_PTR CALLBACK ConnectSettingProc(HWND hDlg, UINT message, WPARAM wPara
                                        SendQuit = SendDlgItemMessage(hDlg, CONNECT_SENDQUIT, BM_GETCHECK, 0, 0);\r
                                        NoRasControl = SendDlgItemMessage(hDlg, CONNECT_NORAS, BM_GETCHECK, 0, 0);\r
                                        // UPnP対応\r
-                                       if(IsUPnPLoaded() == YES)\r
-                                               UPnPEnabled = SendDlgItemMessage(hDlg, CONNECT_UPNP, BM_GETCHECK, 0, 0);\r
+                                       UPnPEnabled = SendDlgItemMessage(hDlg, CONNECT_UPNP, BM_GETCHECK, 0, 0);\r
                                        break;\r
 \r
                                case PSN_RESET :\r

diff --git a/socket.c b/socket.c
index 76f1c68..ce550b8 100644 (file)
--- a/socket.c
+++ b/socket.c
@@ -1362,22 +1362,28 @@ int LoadUPnP()
 {\r
        int Sts;\r
        Sts = FFFTP_FAIL;\r
-       if(CoCreateInstance(&CLSID_UPnPNAT, NULL, CLSCTX_ALL, &IID_IUPnPNAT, (void**)&pUPnPNAT) == S_OK)\r
+       if(IsMainThread())\r
        {\r
-               if(pUPnPNAT->lpVtbl->get_StaticPortMappingCollection(pUPnPNAT, &pUPnPMap) == S_OK)\r
-                       Sts = FFFTP_SUCCESS;\r
+               if(CoCreateInstance(&CLSID_UPnPNAT, NULL, CLSCTX_ALL, &IID_IUPnPNAT, (void**)&pUPnPNAT) == S_OK)\r
+               {\r
+                       if(pUPnPNAT->lpVtbl->get_StaticPortMappingCollection(pUPnPNAT, &pUPnPMap) == S_OK)\r
+                               Sts = FFFTP_SUCCESS;\r
+               }\r
        }\r
        return Sts;\r
 }\r
 \r
 void FreeUPnP()\r
 {\r
-       if(pUPnPMap != NULL)\r
-               pUPnPMap->lpVtbl->Release(pUPnPMap);\r
-       pUPnPMap = NULL;\r
-       if(pUPnPNAT != NULL)\r
-               pUPnPNAT->lpVtbl->Release(pUPnPNAT);\r
-       pUPnPNAT = NULL;\r
+       if(IsMainThread())\r
+       {\r
+               if(pUPnPMap != NULL)\r
+                       pUPnPMap->lpVtbl->Release(pUPnPMap);\r
+               pUPnPMap = NULL;\r
+               if(pUPnPNAT != NULL)\r
+                       pUPnPNAT->lpVtbl->Release(pUPnPNAT);\r
+               pUPnPNAT = NULL;\r
+       }\r
 }\r
 \r
 int IsUPnPLoaded()\r