4.1.3

Console.rc

@@ -1,6 +1,6 @@
 1 VERSIONINFO
-FILEVERSION 2,0,0,88
-PRODUCTVERSION 2,0,0,88
+FILEVERSION 2,0,0,89
+PRODUCTVERSION 2,0,0,89
 FILEOS 0x4
 FILETYPE 0x1
 {
@@ -10,13 +10,13 @@ FILETYPE 0x1
         {
             VALUE "CompanyName", "Martin Prikryl\0"
             VALUE "FileDescription", "Console interface for WinSCP\0"
-            VALUE "FileVersion", "2.0.0.88\0"
+            VALUE "FileVersion", "2.0.0.89\0"
             VALUE "InternalName", "console\0"
             VALUE "LegalCopyright", "(c) 2000-2008 Martin Prikryl\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "winscp.com\0"
             VALUE "ProductName", "WinSCP\0"
-            VALUE "ProductVersion", "4.1.2.0\0"
+            VALUE "ProductVersion", "4.1.3.0\0"
             VALUE "WWW", "http://winscp.net/\0"
         }
     }

DragExt.rc

@@ -1,6 +1,6 @@
 1 VERSIONINFO
-FILEVERSION 1,1,7,85
-PRODUCTVERSION 1,1,7,85
+FILEVERSION 1,1,7,86
+PRODUCTVERSION 1,1,7,86
 FILEOS 0x4
 FILETYPE 0x2
 {
@@ -10,13 +10,13 @@ FILETYPE 0x2
         {
             VALUE "CompanyName", "Martin Prikryl\0"
             VALUE "FileDescription", "Drag&Drop shell extension for WinSCP\0"
-            VALUE "FileVersion", "1.1.7.85\0"
+            VALUE "FileVersion", "1.1.7.86\0"
             VALUE "InternalName", "dragext\0"
             VALUE "LegalCopyright", "(c) 2000-2008 Martin Prikryl\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "dragext.dll\0"
             VALUE "ProductName", "WinSCP\0"
-            VALUE "ProductVersion", "4.1.2.0\0"
+            VALUE "ProductVersion", "4.1.3.0\0"
             VALUE "WWW", "http://winscp.net/\0"
         }
     }

DragExt64.rc

@@ -1,6 +1,6 @@
 1 VERSIONINFO
-FILEVERSION 1,1,7,85
-PRODUCTVERSION 1,1,7,85
+FILEVERSION 1,1,7,86
+PRODUCTVERSION 1,1,7,86
 FILEOS 0x4
 FILETYPE 0x2
 {
@@ -10,13 +10,13 @@ FILETYPE 0x2
         {
             VALUE "CompanyName", "Martin Prikryl\0"
             VALUE "FileDescription", "Drag&Drop shell extension for WinSCP (64-bit)\0"
-            VALUE "FileVersion", "1.1.7.85\0"
+            VALUE "FileVersion", "1.1.7.86\0"
             VALUE "InternalName", "dragext64\0"
             VALUE "LegalCopyright", "(c) 2000-2008 Martin Prikryl\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "dragext64.dll\0"
             VALUE "ProductName", "WinSCP\0"
-            VALUE "ProductVersion", "4.1.2.0\0"
+            VALUE "ProductVersion", "4.1.3.0\0"
             VALUE "WWW", "http://winscp.net/\0"
         }
     }

WinSCP.rc

@@ -1,6 +1,6 @@
 1 VERSIONINFO
-FILEVERSION 4,1,2,388
-PRODUCTVERSION 4,1,2,388
+FILEVERSION 4,1,3,393
+PRODUCTVERSION 4,1,3,393
 FILEOS 0x4
 FILETYPE 0x1
 {
@@ -10,13 +10,13 @@ FILETYPE 0x1
         {
             VALUE "CompanyName", "Martin Prikryl\0"
             VALUE "FileDescription", "SFTP, FTP and SCP client\0"
-            VALUE "FileVersion", "4.1.2.388\0"
+            VALUE "FileVersion", "4.1.3.393\0"
             VALUE "InternalName", "winscp\0"
             VALUE "LegalCopyright", "(c) 2000-2008 Martin Prikryl\0"
             VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "winscp412.exe\0"
+            VALUE "OriginalFilename", "winscp413.exe\0"
             VALUE "ProductName", "WinSCP\0"
-            VALUE "ProductVersion", "4.1.2.0\0"
+            VALUE "ProductVersion", "4.1.3.0\0"
             VALUE "WWW", "http://winscp.net/\0"
         }
     }

core/Script.cpp

@@ -1157,7 +1157,7 @@ void __fastcall TScript::BinaryProc(TScriptProcParams * /*Parameters*/)
 void __fastcall TScript::SynchronizeDirectories(TScriptProcParams * Parameters,
   AnsiString & LocalDirectory, AnsiString & RemoteDirectory, int FirstParam)
 {
-  if (Parameters->ParamCount > FirstParam)
+  if (Parameters->ParamCount >= FirstParam)
   {
     LocalDirectory = Parameters->Param[FirstParam];
   }

release/winscp.u3i

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <u3manifest version="1.0">
-  <application uuid="48b341d1-d411-4b5a-a82c-f3b5d65602fc" version="4.1.2">
+  <application uuid="48b341d1-d411-4b5a-a82c-f3b5d65602fc" version="4.1.3">
     <icon>winscp.ico</icon>
     <name>WinSCP</name>
     <description>Freeware SFTP (SSH File Transfer Protocol), FTP (File Transfer Protocol) and SCP (Secure CoPy) client for Windows using SSH (Secure SHell). Its main function is safe copying of files between a local and a remote computer.</description>

windows/VCLCommon.cpp

@@ -282,7 +282,10 @@ void __fastcall InitializeSystemSettings()
 //---------------------------------------------------------------------------
 void __fastcall FinalizeSystemSettings()
 {
-  // deliberately do not destroy ThemeManager to avoid faults [[bug>226]]
+  if (ThemeManager != NULL)
+  {
+    SAFE_DESTROY(ThemeManager);
+  }
 }
 //---------------------------------------------------------------------------
 // Settings that must be set as soon as possible.
@@ -322,7 +325,7 @@ void __fastcall UseSystemSettingsPre(TCustomForm * Control, void ** Settings)
   }
 
   // especially on login dialog, we need to reapply themes with language change
-  if (ThemeManager != NULL)
+  if ((ThemeManager != NULL) && ThemeManager->ThemesEnabled)
   {
     ThemeManager->CollectForms(Control);
   }