Browse Source

* Do not raise exception unless needed

git-svn-id: trunk@38006 -
michael 7 years ago
parent
commit
1ba38d5b87
1 changed files with 2 additions and 5 deletions
  1. 2 5
      packages/fcl-res/src/groupresource.pp

+ 2 - 5
packages/fcl-res/src/groupresource.pp

@@ -86,11 +86,8 @@ begin
   fItemList:=TFPList.Create;
   fItemList:=TFPList.Create;
   //read NewHeader from resource
   //read NewHeader from resource
   RawData.Position:=0;
   RawData.Position:=0;
-  try
-    RawData.ReadBuffer(nh,sizeof(nh));
-  except
-    on e : EReadError do exit; //empty stream
-  end;
+  if RawData.Read(nh,sizeof(nh))<>nh then 
+    exit;
   {$IFDEF ENDIAN_BIG}
   {$IFDEF ENDIAN_BIG}
   nh.reserved:=SwapEndian(nh.reserved);
   nh.reserved:=SwapEndian(nh.reserved);
   nh.restype:=SwapEndian(nh.restype);
   nh.restype:=SwapEndian(nh.restype);