1
0
mirror of https://github.com/moparisthebest/Simba synced 2024-11-16 14:25:02 -05:00

Merge branch 'master' of ssh://villavu.com:54367/simba

This commit is contained in:
Merlijn Wajer 2010-10-06 16:52:32 +02:00
commit 4cd63ffc48

View File

@ -278,9 +278,9 @@ uses
{Some General PS Functions here} {Some General PS Functions here}
procedure psWriteln(str : string); extdecl; procedure psWriteln(str : string); extdecl;
begin begin
if CurrThread.Prop.WriteTimeStamp then if Assigned(CurrThread) and CurrThread.Prop.WriteTimeStamp then
str := format('[%s]: %s', [TimeToStr(TimeStampToDateTime(MSecsToTimeStamp(GetTickCount - CurrThread.StartTime))), str]); str := format('[%s]: %s', [TimeToStr(TimeStampToDateTime(MSecsToTimeStamp(GetTickCount - CurrThread.StartTime))), str]);
if Assigned(CurrThread.DebugTo) then if Assigned(CurrThread) and Assigned(CurrThread.DebugTo) then
CurrThread.DebugTo(str) CurrThread.DebugTo(str)
else else
mDebugLn(str); mDebugLn(str);
@ -288,7 +288,7 @@ end;
procedure ps_DebugLn(str : string); extdecl; procedure ps_DebugLn(str : string); extdecl;
begin begin
if CurrThread.Prop.WriteTimeStamp then if Assigned(CurrThread) and CurrThread.Prop.WriteTimeStamp then
str := format('[%s]: %s', [TimeToStr(TimeStampToDateTime(MSecsToTimeStamp(GetTickCount - CurrThread.StartTime))), str]); str := format('[%s]: %s', [TimeToStr(TimeStampToDateTime(MSecsToTimeStamp(GetTickCount - CurrThread.StartTime))), str]);
mDebugLn(str); mDebugLn(str);
end; end;