Nested VFS archiving engines supportv0.6.59

1 files changed, 6 insertions, 3 deletions

diff --git a/UCore.pas b/UCore.pas
index 90ea68b..b7f3067 100644
--- a/UCore.pas
+++ b/UCore.pas
@@ -65,12 +65,13 @@ type TVFSCallbackThread = class(TThread)
 
      TWorkerThread = class(TVFSCallbackThread)
      private
-       FCancelled: boolean;
        GUIMutex: TCriticalSection;
      protected
        procedure Execute; override;
        procedure CommitGUIUpdate;
      public
+       FCancelled: boolean;
+
        //  Data to update
        FProgress1Pos, FProgress2Pos, FProgress1Max, FProgress2Max: Int64;
        FProgress1Text, FProgress2Text, FLabel1Text, FLabel2Text: string;
@@ -1176,8 +1177,10 @@ var DefResponse: integer;   //  Global variables for this function
         if (not ParamDir) or (ParamDir and b and IsOnSameFS(ExcludeTrailingPathDelimiter(FullPath), s2))
           then begin
                  Info := SrcEngine.GetFileInfoSL(FullPath);
-                 if Info = nil then DebugMsg(['$$$ Copy: Something went wrong while building the filelist...'])
-                 else begin
+                 if Info = nil then begin
+                   DebugMsg(['$$$ Copy: Something went wrong while building the filelist...']);
+                   ErrorHappened := True;
+                 end else begin
                    Info^.ADestination := strdup(PChar(s));
                    Info^.ForceMove := True;
                    AList.Add(Info);