diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index bbeb7c4c7..41e7be36f 100644 --- a/Configuration/GlobalAssemblyInfo.cs +++ b/Configuration/GlobalAssemblyInfo.cs @@ -15,7 +15,7 @@ internal static class RevisionClass public const string Major = "3"; public const string Minor = "9"; public const string Build = "0"; - public const string Revision = "3421"; + public const string Revision = "3422"; public const string MainVersion = Major + "." + Minor; public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision; diff --git a/Configuration/Version.defs b/Configuration/Version.defs index 80088e00a..d3c8d9271 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ -%MINOR%=9 -%REVISION%=3421 %COREVERSION%=0 +%REVISION%=3422 +%MINOR%=9 %MAJOR%=3 diff --git a/Release/pabcversion.txt b/Release/pabcversion.txt index 6c85760b2..2f0ff700a 100644 --- a/Release/pabcversion.txt +++ b/Release/pabcversion.txt @@ -1 +1 @@ -3.9.0.3421 +3.9.0.3422 diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index 3f895faa7..1d2d8cbc8 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.9.0.3421' +!define VERSION '3.9.0.3422' diff --git a/TestSuite/CompilationSamples/CRT.pas b/TestSuite/CompilationSamples/CRT.pas index 2517d5556..e934f1d11 100644 --- a/TestSuite/CompilationSamples/CRT.pas +++ b/TestSuite/CompilationSamples/CRT.pas @@ -185,9 +185,9 @@ function ReadKey: char;// TODO продумать это var KeyInfo: ConsoleKeyInfo; begin - if NextKey <> Chr(0) then + if NextKey <> #0 then begin - ReadKey := nextkey; + ReadKey := NextKey; NextKey := #0; end else @@ -202,7 +202,7 @@ end; function KeyPressed: boolean; begin - KeyPressed := Console.KeyAvailable; + KeyPressed := (NextKey <> #0) or Console.KeyAvailable; end; function WindowWidth: integer; @@ -330,4 +330,4 @@ end; begin //zdes oshibka ISConsoleApplication u nas nikogda ne inicializiruetsja __InitModule; -end. \ No newline at end of file +end.