Bug 1690: Background transfer settings are not preserved

https://winscp.net/tracker/1690 Caused by c16fd9a Source commit: 230a0f6674b775396272bc9701eaf620472698ca
winscp · Oct 19, 2018 · 3cf2bbe · 3cf2bbe
1 parent 7647aa1
commit 3cf2bbe
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/source/core/CopyParam.h b/source/core/CopyParam.h
@@ -103,8 +103,8 @@ class TCopyParamType
     bool Directory, const TFileMasks::TParams & Params, bool Hidden) const;
   bool __fastcall SkipTransfer(UnicodeString FileName, bool Directory) const;
 
-  void __fastcall Load(THierarchicalStorage * Storage);
-  void __fastcall Save(THierarchicalStorage * Storage, const TCopyParamType * Defaults = NULL) const;
+  virtual void __fastcall Load(THierarchicalStorage * Storage);
+  virtual void __fastcall Save(THierarchicalStorage * Storage, const TCopyParamType * Defaults = NULL) const;
   UnicodeString __fastcall GetInfoStr(UnicodeString Separator, int Attrs) const;
   bool __fastcall AnyUsableCopyParam(int Attrs) const;
   UnicodeString __fastcall GenerateTransferCommandArgs(int Attrs, const UnicodeString & Link) const;

diff --git a/source/windows/GUIConfiguration.cpp b/source/windows/GUIConfiguration.cpp
@@ -86,9 +86,10 @@ void __fastcall TGUICopyParamType::Load(THierarchicalStorage * Storage)
   QueueParallel = Storage->ReadBool(L"QueueParallel", QueueParallel);
 }
 //---------------------------------------------------------------------------
-void __fastcall TGUICopyParamType::Save(THierarchicalStorage * Storage)
+void __fastcall TGUICopyParamType::Save(THierarchicalStorage * Storage, const TCopyParamType * Defaults) const
 {
-  TCopyParamType::Save(Storage);
+  DebugAssert(Defaults == NULL);
+  TCopyParamType::Save(Storage, Defaults);
 
   Storage->WriteBool(L"Queue", Queue);
   Storage->WriteBool(L"QueueNoConfirmation", QueueNoConfirmation);

diff --git a/source/windows/GUIConfiguration.h b/source/windows/GUIConfiguration.h
@@ -28,8 +28,8 @@ class TGUICopyParamType : public TCopyParamType
   __fastcall TGUICopyParamType(const TCopyParamType & Source);
   __fastcall TGUICopyParamType(const TGUICopyParamType & Source);
 
-  void __fastcall Load(THierarchicalStorage * Storage);
-  void __fastcall Save(THierarchicalStorage * Storage);
+  virtual void __fastcall Load(THierarchicalStorage * Storage);
+  virtual void __fastcall Save(THierarchicalStorage * Storage, const TCopyParamType * Defaults = NULL) const;
 
   virtual void __fastcall Default();
   virtual void __fastcall Assign(const TCopyParamType * Source);