Changeset 261 for Common

Timestamp:

Aug 9, 2011, 10:44:42 AM (13 years ago)

Author:

george

Message:

• Modified: TTermThread and function RunInThread now signalize exception.

File:

• Common/UThreading.pas (modified) (4 diffs)

Common/UThreading.pas

@@ -83 +83 @@
   end;
 
+  TTermThreadState = (ttsReady, ttsRunning, ttsFinished, ttsExceptionOccured);
+
   { TTermThread }
 
@@ -88 +90 @@
   private
   public
-    Finished: Boolean;
+    State: TTermThreadState;
+    ExceptionMessage: string;
     Method: TMethodCall;
     procedure Execute; override;
@@ -123 +126 @@
     Thread.Resume;
     Thread.Method := Method;
-    while not Thread.Finished do begin
+    while (Thread.State = ttsRunning) or (Thread.State = ttsReady) do begin
       if MainThreadID = ThreadID then Application.ProcessMessages;
       Sleep(1);
     end;
+    if Thread.State = ttsExceptionOccured then
+      raise Exception.Create(Thread.ExceptionMessage);
   finally
     Thread.Free;
@@ -316 +321 @@
 begin
   try
+    State := ttsRunning;
     Method;
-    Finished := True;
+    State := ttsFinished;
   except
     on E: Exception do
-      if Assigned(OnException) then
+      if Assigned(OnException) then begin
         OnException(FThread, E);
+        ExceptionMessage := E.Message;
+        State := ttsExceptionOccured;
+      end;
   end;
 end;