Merge remote-tracking branch 'ssvine/fix-recursive-sessions'

Author: michaellukashov

src/NetBox/FarPlugin.cpp

@@ -320,19 +320,21 @@ TCustomFarFileSystem * TCustomFarPlugin::GetPanelFileSystem(bool Another,
 {
   TCustomFarFileSystem * Result{nullptr};
   const RECT ActivePanelBounds = GetPanelBounds(PANEL_ACTIVE);
+  const bool IsEmptyActiveRect = IsRectEmpty(&ActivePanelBounds);
   const RECT PassivePanelBounds = GetPanelBounds(PANEL_PASSIVE);
+  const bool IsEmptyPassiveRect = IsRectEmpty(&PassivePanelBounds);
 
   int32_t Index{0};
   while (!Result && (Index < FOpenedPlugins->GetCount()))
   {
     TCustomFarFileSystem * FarFileSystem = FOpenedPlugins->GetAs<TCustomFarFileSystem>(Index);
     DebugAssert(FarFileSystem);
     const RECT Bounds = GetPanelBounds(FarFileSystem);
-    if (Another && CompareRects(Bounds, PassivePanelBounds))
+    if (Another && !IsEmptyPassiveRect && CompareRects(Bounds, PassivePanelBounds))
     {
       Result = FarFileSystem;
     }
-    else if (!Another && CompareRects(Bounds, ActivePanelBounds))
+    else if (!Another && !IsEmptyActiveRect && CompareRects(Bounds, ActivePanelBounds))
     {
       Result = FarFileSystem;
     }
@@ -444,7 +446,6 @@ void TCustomFarPlugin::CloseFileSystem(TCustomFarFileSystem * FileSystem)
   __finally
   {
     FOpenedPlugins->Remove(FileSystem);
-    CloseFileSystem(FileSystem->GetOwnerFileSystem());
     SAFE_DESTROY(FileSystem);
   } end_try__finally
 #ifdef USE_DLMALLOC

src/NetBox/FarPlugin.h

@@ -349,6 +349,8 @@ class TCustomFarFileSystem : public TObject
   void SetOwnerFileSystem(TCustomFarFileSystem * Value) { FOwnerFileSystem = Value; }
   bool GetClosed() const { return FClosed; }
   TCustomFarPlugin * GetPlugin() const { return FPlugin; }
+  bool IsConnectedDirectly() const { return FConnectedDirectly; };
+  void SetConnectedDirectly(bool Value = true) { FConnectedDirectly = Value; }
 
 private:
   TCriticalSection FCriticalSection;
@@ -361,6 +363,7 @@ class TCustomFarFileSystem : public TObject
   gsl::not_null<TCustomFarPlugin *> FPlugin;
   bool FClosed{false};
   static uint32_t FInstances;
+  bool FConnectedDirectly{false};
 
   void ClearOpenPanelInfo(OpenPanelInfo & Info);
   TObjectList * CreatePanelItemList(struct PluginPanelItem * PanelItem, int32_t ItemsNumber);

src/NetBox/NetBox.cpp

@@ -225,6 +225,10 @@ HANDLE WINAPI OpenW(const struct OpenInfo * Info)
   DebugAssert(FarPlugin);
   const TFarPluginGuard Guard;
   const HANDLE Handle = static_cast<HANDLE>(FarPlugin->OpenPlugin(Info));
+  if (!Handle && Info->OpenFrom == OPEN_ANALYSE)
+  {
+    return PANEL_STOP;
+  }
   return Handle;
 }
 

src/NetBox/WinSCPFileSystem.cpp

@@ -1070,7 +1070,8 @@ bool TWinSCPFileSystem::ProcessKeyEx(int32_t Key, uint32_t ControlState)
     }
 
     // Return to session panel
-    if (Focused && !Handled && ((Key == VK_RETURN) && (Focused->GetFileName() == PARENTDIRECTORY) ||
+    if (Focused && !Handled && !IsConnectedDirectly() && 
+         ((Key == VK_RETURN) && (Focused->GetFileName() == PARENTDIRECTORY) ||
          (Key == VK_PRIOR) && (ControlState & CTRLMASK)) && FLastPath == ROOTDIRECTORY)
     {
       SetDirectoryEx(PARENTDIRECTORY, 0);

src/NetBox/WinSCPPlugin.cpp

@@ -275,6 +275,7 @@ int32_t TWinSCPPlugin::ProcessEditorInputEx(const INPUT_RECORD * Rec)
 TCustomFarFileSystem * TWinSCPPlugin::OpenPluginEx(OPENFROM OpenFrom, intptr_t Item)
 {
   std::unique_ptr<TWinSCPFileSystem> FileSystem;
+  bool Success = true;
   CoreInitializeOnce();
   // DEBUG_PRINTF("OpenFrom: %d", (int)OpenFrom);
 
@@ -351,8 +352,9 @@ TCustomFarFileSystem * TWinSCPPlugin::OpenPluginEx(OPENFROM OpenFrom, intptr_t I
           DebugAssert(false);
           Abort();
         }
-        FileSystem->Connect(Session.get());
-        if (!Directory.IsEmpty())
+        FileSystem->SetConnectedDirectly();
+        Success = FileSystem->Connect(Session.get());
+        if (Success && !Directory.IsEmpty())
         {
           FileSystem->SetDirectoryEx(Directory, OPM_SILENT);
         }
@@ -381,14 +383,18 @@ TCustomFarFileSystem * TWinSCPPlugin::OpenPluginEx(OPENFROM OpenFrom, intptr_t I
         DebugAssert(false);
         Abort();
       }
-      FileSystem->Connect(Session.get());
+      FileSystem->SetConnectedDirectly();
+      Success = FileSystem->Connect(Session.get());
     }
     else
     {
       DebugAssert(false);
     }
   }
-
+  if (!Success)
+  {
+    FileSystem.reset(nullptr);
+  }
   return FileSystem.release();
 }
 

src/core/FtpFileSystem.cpp

@@ -1994,6 +1994,8 @@ void TFTPFileSystem::DoStartup()
   // retrieve initialize working directory to save it as home directory
   ReadCurrentDirectory();
   FHomeDirectory = FCurrentDirectory;
+  // clear FCurrentDirectory (it will be set later during TTerminal::DoStartup execution)
+  FCurrentDirectory.Clear();
 }
 
 void TFTPFileSystem::HomeDirectory()

src/core/S3FileSystem.cpp

@@ -1045,7 +1045,7 @@ void TS3FileSystem::ReadCurrentDirectory()
 {
   if (FCachedDirectoryChange.IsEmpty())
   {
-    FCurrentDirectory = FCurrentDirectory.IsEmpty() ? UnicodeString(L"/") : FCurrentDirectory;
+    // FCurrentDirectory is set later during TTerminal::DoStartup execution
   }
   else
   {

src/core/WebDAVFileSystem.cpp

@@ -273,12 +273,14 @@ void TWebDAVFileSystem::OpenUrl(const UnicodeString & Url)
     CorrectedUrl = Url;
   }
   const UnicodeString ParsedPath = ParsePathFromUrl(CorrectedUrl);
+#if defined(__BORLANDC__)
   if (!ParsedPath.IsEmpty())
   {
     // this is most likely pointless as it get overwritten by
     // call to ChangeDirectory() from TTerminal::DoStartup
     FCurrentDirectory = ParsedPath;
   }
+#endif // defined(__BORLANDC__)
 }
 
 void TWebDAVFileSystem::NeonClientOpenSessionInternal(UnicodeString & CorrectedUrl, const UnicodeString & AUrl)
@@ -736,7 +738,7 @@ void TWebDAVFileSystem::ReadCurrentDirectory()
 {
   if (FCachedDirectoryChange.IsEmpty())
   {
-    FCurrentDirectory = FCurrentDirectory.IsEmpty() ? UnicodeString(ROOTDIRECTORY) : FCurrentDirectory;
+    // FCurrentDirectory is set later during TTerminal::DoStartup execution
   }
   else
   {