瀏覽代碼

Merge branch 'fixes_3_2' into release_3_2_4-branch

florian 1 年之前
父節點
當前提交
ba34a5fe2c
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 1 1
      packages/fcl-process/src/win/process.inc
  2. 1 1
      packages/fcl-web/src/base/fpmimetypes.pp

+ 1 - 1
packages/fcl-process/src/win/process.inc

@@ -40,7 +40,7 @@ Function TProcessnamemacro.PeekExitStatus : Boolean;
 begin
   Result:=GetExitCodeProcess(ProcessHandle,FExitCode) and (FExitCode<>Still_Active);
   // 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);
 end;
 

+ 1 - 1
packages/fcl-web/src/base/fpmimetypes.pp

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