Fix bugs of file list type detection.

[ffftp/ffftp.git] / registry.c

diff --git a/registry.c b/registry.c
index 2e74c00..ac8e8d5 100644 (file)
--- a/registry.c
+++ b/registry.c
@@ -241,6 +241,8 @@ extern time_t LastAutoCheckForUpdates;
 extern int AbortOnListError;\r
 // ミラーリング設定追加\r
 extern int MirrorNoTransferContents; \r
+// FireWall設定追加\r
+extern int FwallNoSaveUser; \r
 \r
 /*----- マスタパスワードの設定 ----------------------------------------------\r
 *\r
@@ -544,8 +546,19 @@ void SaveRegistry(void)
                                WriteIntValueToReg(hKey4, "ListDrv", DispDrives);\r
 \r
                                WriteStringToReg(hKey4, "FwallHost", FwallHost);\r
-                               WriteStringToReg(hKey4, "FwallUser", FwallUser);\r
-                               EncodePassword(FwallPass, Str);\r
+                               // FireWall設定追加\r
+//                             WriteStringToReg(hKey4, "FwallUser", FwallUser);\r
+//                             EncodePassword(FwallPass, Str);\r
+                               if(FwallNoSaveUser == YES)\r
+                               {\r
+                                       WriteStringToReg(hKey4, "FwallUser", "");\r
+                                       EncodePassword("", Str);\r
+                               }\r
+                               else\r
+                               {\r
+                                       WriteStringToReg(hKey4, "FwallUser", FwallUser);\r
+                                       EncodePassword(FwallPass, Str);\r
+                               }\r
                                WriteStringToReg(hKey4, "FwallPass", Str);\r
                                WriteIntValueToReg(hKey4, "FwallPort", FwallPort);\r
                                WriteIntValueToReg(hKey4, "FwallType", FwallType);\r
@@ -845,6 +858,8 @@ void SaveRegistry(void)
                                WriteIntValueToReg(hKey4, "AbortListErr", AbortOnListError);\r
                                // ミラーリング設定追加\r
                                WriteIntValueToReg(hKey4, "MirNoTransfer", MirrorNoTransferContents);\r
+                               // FireWall設定追加\r
+                               WriteIntValueToReg(hKey4, "FwallShared", FwallNoSaveUser);\r
                        }\r
                        CloseSubKey(hKey4);\r
                }\r
@@ -1435,6 +1450,8 @@ int LoadRegistry(void)
                        ReadIntValueFromReg(hKey4, "AbortListErr", &AbortOnListError);\r
                        // ミラーリング設定追加\r
                        ReadIntValueFromReg(hKey4, "MirNoTransfer", &MirrorNoTransferContents);\r
+                       // FireWall設定追加\r
+                       ReadIntValueFromReg(hKey4, "FwallShared", &FwallNoSaveUser);\r
 \r
                        CloseSubKey(hKey4);\r
                }\r