|
@@ -205,7 +205,7 @@ end;
|
|
|
|
|
|
|
|
destructor TThread.Destroy;
|
|
destructor TThread.Destroy;
|
|
|
begin
|
|
begin
|
|
|
- if (FThreadID = GetCurrentThreadID) and not(FFreeOnTerminate) then begin
|
|
|
|
|
|
|
+ if (FThreadID = GetCurrentThreadID) and not(FFreeOnTerminate) and not ffinished then begin
|
|
|
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!');
|
|
|
end;
|
|
end;
|
|
|
// if someone calls .Free on a thread with
|
|
// if someone calls .Free on a thread with
|
marco