Browse Source

Bug 2186: Failure when application log cannot be opened

https://winscp.net/tracker/2186

Source commit: 31e8745f4e346efd6efe581f9e8adfcf9cfbb3f5
Martin Prikryl 2 years ago
parent
commit
fce651138a
1 changed files with 13 additions and 12 deletions
  1. 13 12
      source/WinSCP.cpp

+ 13 - 12
source/WinSCP.cpp

@@ -17,21 +17,22 @@ USEFORM("forms\ScpExplorer.cpp", ScpExplorerForm);
 //---------------------------------------------------------------------------
 WINAPI wWinMain(HINSTANCE, HINSTANCE, LPWSTR, int)
 {
-  ApplicationLog = new TApplicationLog();
-  TProgramParams * Params = TProgramParams::Instance();
-  UnicodeString AppLogPath;
-  if (Params->FindSwitch(L"applog", AppLogPath))
-  {
-    ApplicationLog->Enable(AppLogPath);
-  }
-  AppLog(L"Starting...");
-
-  AddStartupSequence(L"M");
-  DllHijackingProtection();
-  AddStartupSequence(L"T");
   int Result = 0;
   try
   {
+    TProgramParams * Params = TProgramParams::Instance();
+    ApplicationLog = new TApplicationLog();
+    UnicodeString AppLogPath;
+    if (Params->FindSwitch(L"applog", AppLogPath))
+    {
+      ApplicationLog->Enable(AppLogPath);
+    }
+    AppLog(L"Starting...");
+
+    AddStartupSequence(L"M");
+    DllHijackingProtection();
+    AddStartupSequence(L"T");
+
     WinInitialize();
     Application->Initialize();
     Application->MainFormOnTaskBar = true;