paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-05 13:18:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fixes_3_2' into release_3_2_4-branch

Browse Source
This commit is contained in:
florian 2024-07-30 19:24:57 +02:00
commit ba34a5fe2c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/fcl-process/src/win/process.inc
View File

@ -40,7 +40,7 @@ Function TProcessnamemacro.PeekExitStatus : Boolean;
begin begin
Result:=GetExitCodeProcess(ProcessHandle,FExitCode) and (FExitCode<>Still_Active); Result:=GetExitCodeProcess(ProcessHandle,FExitCode) and (FExitCode<>Still_Active);
// wait up to 10ms extra till process really done to get rest of input bug #39821 // wait up to 10ms extra till process really done to get rest of input bug #39821
if not Result Then if Result Then
WaitForSingleObject(FProcessHandle,10); WaitForSingleObject(FProcessHandle,10);
end; end;

2
packages/fcl-web/src/base/fpmimetypes.pp
View File

@ -266,7 +266,7 @@ begin
aType:= Reg.ReadString('Content Type'); aType:= Reg.ReadString('Content Type');
Reg.CloseKey; Reg.CloseKey;
if aType<>'' then if aType<>'' then
AddType(aType,Ext); AddType(aType,Copy(Ext,2,Length(Ext)-1));
end; end;
end; end;
Reg.CloseKey; Reg.CloseKey;