mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-08-28 17:00:40 +02:00
Fix merge error that resulted in wrong position of finalization code
git-svn-id: trunk@30432 -
This commit is contained in:
parent
c4617ee2ad
commit
59e2728940
@ -954,12 +954,6 @@ Initialization
|
|||||||
FillChar(ConsoleInfo, SizeOf(ConsoleInfo), 0);
|
FillChar(ConsoleInfo, SizeOf(ConsoleInfo), 0);
|
||||||
GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), ConsoleInfo);
|
GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), ConsoleInfo);
|
||||||
|
|
||||||
finalization
|
|
||||||
if beeperDevice <> INVALID_HANDLE_VALUE then begin
|
|
||||||
nosound;
|
|
||||||
CloseHandle(beeperDevice);
|
|
||||||
DefineDosDevice(DDD_REMOVE_DEFINITION,'DosBeep','\Device\Beep');
|
|
||||||
end;
|
|
||||||
TextAttr := ConsoleInfo.wAttributes;
|
TextAttr := ConsoleInfo.wAttributes;
|
||||||
|
|
||||||
{ Not required, the dos crt does also not touch the mouse }
|
{ Not required, the dos crt does also not touch the mouse }
|
||||||
@ -982,4 +976,10 @@ finalization
|
|||||||
AssignCrt(Input);
|
AssignCrt(Input);
|
||||||
Reset(Input);
|
Reset(Input);
|
||||||
TextRec(Input).Handle:= GetStdHandle(STD_INPUT_HANDLE);
|
TextRec(Input).Handle:= GetStdHandle(STD_INPUT_HANDLE);
|
||||||
|
finalization
|
||||||
|
if beeperDevice <> INVALID_HANDLE_VALUE then begin
|
||||||
|
nosound;
|
||||||
|
CloseHandle(beeperDevice);
|
||||||
|
DefineDosDevice(DDD_REMOVE_DEFINITION,'DosBeep','\Device\Beep');
|
||||||
|
end;
|
||||||
end. { unit Crt }
|
end. { unit Crt }
|
||||||
|
Loading…
Reference in New Issue
Block a user