From a3eb0bec678c37470c8f401d9ba3f0459ebef28f Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Tue, 9 Jan 2018 15:26:26 +0100
Subject: mystringlistunit.pas: tMyStringList.unfoldMacros: shellSubst eher
 ausführen
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mystringlistunit.pas | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/mystringlistunit.pas b/mystringlistunit.pas
index 98fdb07..3f7fdf4 100644
--- a/mystringlistunit.pas
+++ b/mystringlistunit.pas
@@ -463,6 +463,14 @@ begin
     end;
 
     for i:=0 to count-1 do begin   // Shellvariablen auswerten
+      s:=systemunit.shellSubst(self[i]);
+      if s<>self[i] then begin
+        wasGefunden:=true;
+        self[i]:=s;
+      end;
+    end;
+
+    for i:=0 to count-1 do begin   // Shellexpansionen auswerten
       s:=shellExpand(self[i]);
       if s<>self[i] then begin
         wasGefunden:=true;
@@ -496,14 +504,6 @@ begin
     end;
     if wasGefunden then continue;
 
-    for i:=0 to count-1 do begin   // Shellvariablen auswerten
-      s:=shellSubst(self[i]);
-      if s<>self[i] then begin
-        wasGefunden:=true;
-        self[i]:=s;
-      end;
-    end;
-
     i:=0;
     while i<count do begin  // Schleifen ausrollen
       s:=self[i];
-- 
cgit v1.2.3-70-g09d2