Przeglądaj źródła

* add filename before eparsererror and reraise closes 0040958

marcoonthegit 1 rok temu
rodzic
commit
4300e2cfcc
1 zmienionych plików z 9 dodań i 1 usunięć
  1. 9 1
      utils/fpcres/sourcehandler.pas

+ 9 - 1
utils/fpcres/sourcehandler.pas

@@ -114,7 +114,15 @@ begin
           TRCResourceReader(aReader).RCDefines.Assign(fRCDefines);
           TRCResourceReader(aReader).RCDefines.Assign(fRCDefines);
           SetCurrentDir(ExtractFilePath(ExpandFileName(fFileList[i])));
           SetCurrentDir(ExtractFilePath(ExpandFileName(fFileList[i])));
         end;
         end;
-        tmpres.LoadFromStream(aStream,aReader);
+        try
+          tmpres.LoadFromStream(aStream,aReader);
+        except
+           on e :EParserError do
+              begin
+                e.message:=fFileList[i]+': '+e.message;
+              raise;
+            end;
+        end;
         aResources.MoveFrom(tmpres);
         aResources.MoveFrom(tmpres);
         Messages.DoVerbose('Resource information read');
         Messages.DoVerbose('Resource information read');
       finally
       finally