Просмотр исходного кода

Bug 1684: Failure when canceling session reconnect (4th)

https://winscp.net/tracker/1684
(cherry picked from commit f1624975f0cf8318f9c6d6c991719fb275a90cc2)

Source commit: 54a25d09a5b3bbaa8085fc6230fd59f55b0b45ec
Martin Prikryl 7 лет назад
Родитель
Сommit
fc4ba3229c
1 измененных файлов с 4 добавлено и 1 удалено
  1. 4 1
      source/components/UnixDriveView.cpp

+ 4 - 1
source/components/UnixDriveView.cpp

@@ -79,7 +79,10 @@ void __fastcall TCustomUnixDriveView::SetTerminal(TTerminal * value)
     FTerminal = value;
     Items->Clear();
     #ifndef DESIGN_ONLY
-    if (FTerminal != NULL)
+    // If terminal is not active initially, we will never load fixed paths, when it become active.
+    // But actually terminal is not active here, only when we are replacing an abandoned terminal
+    // with a dummy one (which will never become active)
+    if ((FTerminal != NULL) && FTerminal->Active)
     {
       TStrings * FixedPaths = FTerminal->FixedPaths;
       if (FixedPaths != NULL)