Răsfoiți Sursa

Bug fix: Failure when submitting Advanced Site Settings dialog

(cherry picked from commit eab7cb37337bff77309bdddd592b2fccb97d5f76)

Source commit: 7f34f083af87107ceb00d9fa0ff0c95896ea31ed
Martin Prikryl 4 ani în urmă
părinte
comite
f075b76ee8
1 a modificat fișierele cu 2 adăugiri și 3 ștergeri
  1. 2 3
      source/windows/Tools.cpp

+ 2 - 3
source/windows/Tools.cpp

@@ -1288,6 +1288,7 @@ static void __fastcall ConvertKey(UnicodeString & FileName, TKeyType Type)
 //---------------------------------------------------------------------------
 void DoVerifyKey(UnicodeString & FileName, bool Convert, UnicodeString & Message, TStrings *& MoreMessages, UnicodeString & HelpKeyword)
 {
+  std::unique_ptr<TStrings> AMoreMessages;
   if (!FileName.Trim().IsEmpty())
   {
     FileName = ExpandEnvironmentVariables(FileName);
@@ -1296,7 +1297,6 @@ void DoVerifyKey(UnicodeString & FileName, bool Convert, UnicodeString & Message
     int Error = errno;
     HelpKeyword = HELP_LOGIN_KEY_TYPE;
     UnicodeString PuttygenPath;
-    std::unique_ptr<TStrings> AMoreMessages;
     switch (Type)
     {
       case ktOpenSSHPEM:
@@ -1357,9 +1357,8 @@ void DoVerifyKey(UnicodeString & FileName, bool Convert, UnicodeString & Message
         Message = MainInstructions(FMTLOAD(KEY_TYPE_UNKNOWN2, (FileName)));
         break;
     }
-
-    MoreMessages = AMoreMessages.release();
   }
+  MoreMessages = AMoreMessages.release();
 }
 
 //---------------------------------------------------------------------------