Merge branch 'master' into dev

# Conflicts:
#	source/WinSCP.cbproj

Source commit: e06a14187146c132b844e2418b02e4ff0dea6571

source/forms/CustomScpExplorer.cpp

@@ -3947,7 +3947,7 @@ void TCustomScpExplorerForm::EditedFileUploaded(TTerminal * ATerminal, HANDLE Up
         if (DebugAlwaysTrue(Data != NULL))
         {
           Data->SourceTimestamp = File->Modification;
-          AppLogFmt(L"Uploaded edited remote file timestamp: %s: ", (StandardTimestamp(Data->SourceTimestamp)));
+          AppLogFmt(L"Uploaded edited remote file timestamp: %s", (StandardTimestamp(Data->SourceTimestamp)));
         }
       }
     }

source/windows/EditorManager.cpp

@@ -534,10 +534,19 @@ void __fastcall TEditorManager::CheckFileChange(int Index, bool Force)
     TFileData * FileData = &FFiles[Index];
     if (FileData->UploadCompleteEvent != INVALID_HANDLE_VALUE)
     {
+      AppLogFmt(L"Opened/edited file \"%s\" was changed, but it still being uploaded.", (FileData->FileName));
       FileData->Reupload = true;
     }
     else
     {
+      if (Changed)
+      {
+        AppLogFmt(L"Opened/edited file \"%s\" was changed.", (FileData->FileName));
+      }
+      else
+      {
+        AppLogFmt(L"Forcing upload of opened/edited file \"%s\".", (FileData->FileName));
+      }
       bool Upload = true;
       if (!Force)
       {
@@ -545,6 +554,7 @@ void __fastcall TEditorManager::CheckFileChange(int Index, bool Force)
         if (Handle == INVALID_HANDLE_VALUE)
         {
           int Error = GetLastError();
+          AppLogFmt(L"Opened/edited file \"%s\" is locked, delaying upload.", (FileData->FileName));
           if (Error == ERROR_ACCESS_DENIED)
           {
             Upload = false;
@@ -573,15 +583,18 @@ void __fastcall TEditorManager::CheckFileChange(int Index, bool Force)
         {
           DebugAssert(OnFileChange != NULL);
           bool Retry = false;
+          AppLogFmt(L"Uploading opened/edited file \"%s\".", (FileData->FileName));
           OnFileChange(FileData->FileName, FileData->Data, FileData->UploadCompleteEvent, Retry);
           if (Retry)
           {
+            AppLogFmt(L"Will retry uploading opened/edited file \"%s\".", (FileData->FileName));
             UploadComplete(Index);
             FileData->Timestamp = PrevTimestamp;
           }
         }
         catch(...)
         {
+          AppLogFmt(L"Failed to upload opened/edited file \"%s\".", (FileData->FileName));
           // upload failed (was not even started)
           if (FileData->UploadCompleteEvent != INVALID_HANDLE_VALUE)
           {