git-svn-id: trunk@595 -
@@ -166,7 +166,13 @@ begin
If (ExceptProc<>Nil) and (ExceptObjectStack<>Nil) then
with ExceptObjectStack^ do
TExceptProc(ExceptProc)(FObject,Addr,FrameCount,Frames);
- RunError(217);
+ if erroraddr = nil then
+ RunError(217)
+ else
+ if errorcode <= maxExitCode then
+ halt(errorcode)
+ halt(255)
end;
@@ -678,6 +678,8 @@ begin
errorcode:=word(Errno);
erroraddr:=addr;
errorbase:=frame;
+ if ExceptAddrStack <> nil then
+ raise TObject(nil) at addr,frame;
if errorcode <= maxExitCode then
halt(errorcode)
else