Fix bugs of file list type detection.

[ffftp/ffftp.git] / option.c

diff --git a/option.c b/option.c
index a900373..c6a64aa 100644 (file)
--- a/option.c
+++ b/option.c
@@ -196,6 +196,8 @@ extern int AutoCheckForUptatesInterval;
 extern int AbortOnListError;\r
 // ミラーリング設定追加\r
 extern int MirrorNoTransferContents; \r
+// FireWall設定追加\r
+extern int FwallNoSaveUser; \r
 \r
 \r
 /*----- オプションのプロパティシート ------------------------------------------\r
@@ -1012,6 +1014,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 +1352,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
@@ -1458,6 +1460,10 @@ static INT_PTR CALLBACK FireSettingProc(HWND hDlg, UINT message, WPARAM wParam,
                        SendDlgItemMessage(hDlg, FIRE_SECURITY, CB_ADDSTRING, 0, (LPARAM)MSGJPN215);\r
                        SendDlgItemMessage(hDlg, FIRE_SECURITY, CB_ADDSTRING, 0, (LPARAM)MSGJPN216);\r
                        SendDlgItemMessage(hDlg, FIRE_SECURITY, CB_SETCURSEL, FwallSecurity, 0);\r
+\r
+                       // FireWall設定追加\r
+                       SendDlgItemMessage(hDlg, FIRE_SHARED, BM_SETCHECK, FwallNoSaveUser, 0);\r
+\r
                    return(TRUE);\r
 \r
                case WM_NOTIFY:\r
@@ -1479,6 +1485,8 @@ static INT_PTR CALLBACK FireSettingProc(HWND hDlg, UINT message, WPARAM wParam,
                                        FwallResolve = SendDlgItemMessage(hDlg, FIRE_RESOLV, BM_GETCHECK, 0, 0);\r
                                        FwallLower = SendDlgItemMessage(hDlg, FIRE_LOWER, BM_GETCHECK, 0, 0);\r
                                        FwallSecurity = SendDlgItemMessage(hDlg, FIRE_SECURITY, CB_GETCURSEL, 0, 0);\r
+                                       // FireWall設定追加\r
+                                       FwallNoSaveUser = SendDlgItemMessage(hDlg, FIRE_SHARED, BM_GETCHECK, 0, 0);\r
                                        break;\r
 \r
                                case PSN_RESET :\r
@@ -2001,7 +2009,7 @@ static INT_PTR CALLBACK UpdatesSettingProc(HWND hDlg, UINT message, WPARAM wPara
                                        break;\r
 \r
                                case PSN_HELP :\r
-//                                     hHelpWin = HtmlHelp(NULL, AskHelpFilePath(), HH_HELP_CONTEXT, IDH_HELP_TOPIC_0000069);\r
+                                       hHelpWin = HtmlHelp(NULL, AskHelpFilePath(), HH_HELP_CONTEXT, IDH_HELP_TOPIC_0000069);\r
                                        break;\r
                        }\r
                        break;\r