浏览代码

Merged revisions 2141 via svnmerge from
svn+ssh://[email protected]/FPC/svn/fpc/trunk

........
r2141 | marco | 2006-01-03 20:09:25 +0100 (Tue, 03 Jan 2006) | 2 lines

* ffinish patch

........

git-svn-id: branches/fixes_2_0@2142 -

marco 20 年之前
父节点
当前提交
5b71dae116
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      rtl/linux/tthread.inc

+ 2 - 1
rtl/linux/tthread.inc

@@ -205,7 +205,8 @@ end;
 
 
 destructor TThread.Destroy;
 destructor TThread.Destroy;
 begin
 begin
-  if (FThreadID = GetCurrentThreadID) and not(FFreeOnTerminate) then
+  if (FThreadID = GetCurrentThreadID) and not(FFreeOnTerminate) 
+	and not fFinished then		
     raise EThreadDestroyCalled.Create('A thread cannot destroy itself except by setting FreeOnTerminate and leaving!');
     raise EThreadDestroyCalled.Create('A thread cannot destroy itself except by setting FreeOnTerminate and leaving!');
 
 
   // if someone calls .Free on a thread with
   // if someone calls .Free on a thread with