Fix bugs of all settings encryption.

diff --git a/FFFTP_Eng_Release/FFFTP.exe b/FFFTP_Eng_Release/FFFTP.exe
index 87d3813..c89106c 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 8e70016..43c6303 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 f6c5945..eb300f2 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 b09bd93..6bb9f07 100644 (file)
Binary files a/Release_64/FFFTP.exe and b/Release_64/FFFTP.exe differ

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

diff --git a/registry.c b/registry.c
index 15da21b..2e74c00 100644 (file)
--- a/registry.c
+++ b/registry.c
@@ -959,33 +959,36 @@ int LoadRegistry(void)
                        IniKanjiCode = KANJI_SJIS;\r
 \r
                // 全設定暗号化対応\r
-               if(GetMasterPasswordStatus() == PASSWORD_OK)\r
+               if(Version >= 1990)\r
                {\r
-                       ReadIntValueFromReg(hKey3, "EncryptAll", &EncryptAllSettings);\r
-                       sprintf(Buf, "%d", EncryptAllSettings);\r
-                       ReadStringFromReg(hKey3, "EncryptAllDetector", Str, 255);\r
-                       DecodePassword(Str, Buf2);\r
-                       EncryptSettings = EncryptAllSettings;\r
-                       memset(&EncryptSettingsChecksum, 0, 20);\r
-                       if(strcmp(Buf, Buf2) != 0)\r
+                       if(GetMasterPasswordStatus() == PASSWORD_OK)\r
                        {\r
-                               switch(DialogBox(GetFtpInst(), MAKEINTRESOURCE(corruptsettings_dlg), GetMainHwnd(), AnyButtonDialogProc))\r
+                               ReadIntValueFromReg(hKey3, "EncryptAll", &EncryptAllSettings);\r
+                               sprintf(Buf, "%d", EncryptAllSettings);\r
+                               ReadStringFromReg(hKey3, "EncryptAllDetector", Str, 255);\r
+                               DecodePassword(Str, Buf2);\r
+                               EncryptSettings = EncryptAllSettings;\r
+                               memset(&EncryptSettingsChecksum, 0, 20);\r
+                               if(strcmp(Buf, Buf2) != 0)\r
                                {\r
-                               case IDCANCEL:\r
-                                       Terminate();\r
-                                       break;\r
-                               case IDABORT:\r
-                                       CloseReg(hKey3);\r
-                                       ClearRegistry();\r
-                                       ClearIni();\r
-                                       Restart();\r
-                                       Terminate();\r
-                                       break;\r
-                               case IDRETRY:\r
-                                       EncryptSettingsError = YES;\r
-                                       break;\r
-                               case IDIGNORE:\r
-                                       break;\r
+                                       switch(DialogBox(GetFtpInst(), MAKEINTRESOURCE(corruptsettings_dlg), GetMainHwnd(), AnyButtonDialogProc))\r
+                                       {\r
+                                       case IDCANCEL:\r
+                                               Terminate();\r
+                                               break;\r
+                                       case IDABORT:\r
+                                               CloseReg(hKey3);\r
+                                               ClearRegistry();\r
+                                               ClearIni();\r
+                                               Restart();\r
+                                               Terminate();\r
+                                               break;\r
+                                       case IDRETRY:\r
+                                               EncryptSettingsError = YES;\r
+                                               break;\r
+                                       case IDIGNORE:\r
+                                               break;\r
+                                       }\r
                                }\r
                        }\r
                }\r