Bug 2060: Failure when changing remote folder using directory tree wh…

…ile previous directory is still loading (2nd)

https://winscp.net/tracker/2060

Source commit: 14adf07852fc0164a565161262cff058d9071377

source/components/UnixDriveView.cpp

@@ -52,6 +52,7 @@ __fastcall TCustomUnixDriveView::TCustomUnixDriveView(TComponent* Owner) :
   FDummyDragFile = NULL;
   FPendingDelete = new TList();
   FDragDropFilesEx->PreferCopy = true;
+  FChangingDirectory = false;
 }
 //---------------------------------------------------------------------------
 __fastcall TCustomUnixDriveView::~TCustomUnixDriveView()
@@ -467,7 +468,7 @@ bool __fastcall TCustomUnixDriveView::CanChange(TTreeNode * Node)
 {
   return
     TCustomDriveView::CanChange(Node) &&
-    FCanChange;
+    !FChangingDirectory;
 }
 //---------------------------------------------------------------------------
 void __fastcall TCustomUnixDriveView::Change(TTreeNode * Node)
@@ -512,8 +513,8 @@ void __fastcall TCustomUnixDriveView::Change(TTreeNode * Node)
           {
             // Prevent curther changes while loading the folder.
             // Particularly prevent user from trying to proceed with incremental search.
-            TValueRestorer<bool> CanChangeRestorer(FCanChange);
-            FCanChange = false;
+            TValueRestorer<bool> ChangingDirectoryRestorer(FChangingDirectory);
+            FChangingDirectory = true;
             Terminal->ChangeDirectory(NodePathName(Node));
           }
           TCustomDriveView::Change(Node);

source/components/UnixDriveView.h

@@ -98,6 +98,7 @@ friend class TUnixDirView;
   bool FShowInaccesibleDirectories;
   TRemoteFile * FDummyDragFile;
   TList * FPendingDelete;
+  bool FChangingDirectory;
 
   bool __fastcall IsRootNameStored();
   void __fastcall SetShowInaccesibleDirectories(bool value);