global-functions.rsc

@@ -559,12 +559,6 @@
 :set FileGet do={
   :local FileName [ :tostr $1 ];
 
-  :global WaitForFile;
-
-  :if ([ $WaitForFile $FileName 0s ] = false) do={
-    :return false;
-  }
-
   :local FileVal false;
   :do {
     :set FileVal [ /file/get $FileName ];
@@ -1777,26 +1771,14 @@
   :global MAX;
 
   :set FileName [ $CleanFilePath $FileName ];
-  :local Delay ([ $MAX [ $EitherOr $WaitTime 2s ] 100ms ] / 9);
+  :local Delay ([ $MAX [ $EitherOr $WaitTime 2s ] 100ms ] / 10);
 
   :do {
-    :retry { 
-      :if ([ :len [ /file/find where name=$FileName ] ] = 0) do={
-        :error false;
-      }
-    } delay=$Delay max=10;
-  } on-error={
-    :return false;
-  }
-
-  :while ([ :len [ /file/find where name=$FileName ] ] > 0) do={
-    :do {
+    :retry {
       /file/get $FileName;
       :return true;
-    } on-error={ }
-    :delay $Delay;
-    :set Delay ($Delay * 3 / 2);
-  }
+    } delay=$Delay max=10;
+  } on-error={ }
 
   :return false;
 }