+ Correct behaviour when initialization fails.

git-svn-id: trunk@3841 -
This commit is contained in:
daniel 2006-06-11 09:00:19 +00:00
parent 542bb08ee4
commit 4a3248bc08
2 changed files with 15 additions and 12 deletions

View File

@ -149,17 +149,20 @@ end;
Procedure InitVideo; Procedure InitVideo;
begin begin
If Not VideoInitialized then if not VideoInitialized then
begin begin
If Assigned(CurrentVideoDriver.InitDriver) then if Assigned(CurrentVideoDriver.InitDriver) then
CurrentVideoDriver.InitDriver; CurrentVideoDriver.InitDriver;
VideoInitialized:=True; if errorcode=viook then
begin
VideoInitialized:=true;
if NextVideoModeSet then if NextVideoModeSet then
SetVideoMode(NextVideoMode) SetVideoMode(NextVideoMode)
else else
AssignVideoBuf(0,0); AssignVideoBuf(0,0);
ClearScreen; ClearScreen;
end; end;
end;
end; end;

View File

@ -1098,11 +1098,11 @@ begin
{$endif logging} {$endif logging}
{ save new terminal characteristics and possible restore rawness } { save new terminal characteristics and possible restore rawness }
videoInitDone; videoInitDone;
decide_codepages;
end end
else else
ErrorCode:=errVioInit; { not a TTY } ErrorCode:=errVioInit; { not a TTY }
decide_codepages;
end; end;
procedure SysDoneVideo; procedure SysDoneVideo;