From 81ad1a24a6b0b2de429ba1edd33cc41fe5ae4f12 Mon Sep 17 00:00:00 2001 From: Mikhalkovich Stanislav Date: Sat, 2 Sep 2023 12:45:20 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=B2=20Linux=20=D1=81=D0=B4=D0=B5=D0=BB=D0=B0?= =?UTF-8?q?=D0=BB=20=D1=82=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE=D0=B2=20DebugBrea?= =?UTF-8?q?k?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ошибку форматирования в Linux приглушил --- Configuration/GlobalAssemblyInfo.cs | 2 +- Configuration/Version.defs | 4 ++-- Release/pabcversion.txt | 2 +- ReleaseGenerators/PascalABCNET_version.nsh | 2 +- VisualPascalABCNETLinux/DS/Tools.cs | 2 ++ VisualPascalABCNETLinux/IB/Debugger/Debugger.cs | 4 +++- 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index 1a5358905..b7b29f8cd 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 = "3348"; + public const string Revision = "3349"; 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 774f40ea5..304c7569b 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ -%COREVERSION%=0 -%REVISION%=3348 %MINOR%=9 +%REVISION%=3349 +%COREVERSION%=0 %MAJOR%=3 diff --git a/Release/pabcversion.txt b/Release/pabcversion.txt index 55f5347e1..52e2f648a 100644 --- a/Release/pabcversion.txt +++ b/Release/pabcversion.txt @@ -1 +1 @@ -3.9.0.3348 +3.9.0.3349 diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index 6d89ce60b..64c2198b1 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.9.0.3348' +!define VERSION '3.9.0.3349' diff --git a/VisualPascalABCNETLinux/DS/Tools.cs b/VisualPascalABCNETLinux/DS/Tools.cs index 7893a8bdf..3859d0e89 100644 --- a/VisualPascalABCNETLinux/DS/Tools.cs +++ b/VisualPascalABCNETLinux/DS/Tools.cs @@ -15,6 +15,8 @@ public class Tools public static string GetTextFromClipboard() { IDataObject dataObject = Clipboard.GetDataObject(); + if (dataObject == null) + return ""; if (dataObject.GetDataPresent(DataFormats.Text)) { // Yes it is, so display it in a text box. diff --git a/VisualPascalABCNETLinux/IB/Debugger/Debugger.cs b/VisualPascalABCNETLinux/IB/Debugger/Debugger.cs index 76a5fcbc7..f7321c296 100644 --- a/VisualPascalABCNETLinux/IB/Debugger/Debugger.cs +++ b/VisualPascalABCNETLinux/IB/Debugger/Debugger.cs @@ -431,8 +431,10 @@ public void Start(string fileName, string sourceFileName, string workingDirector public void NullProcessHandleIfNeed(string fileName) { +#if DEBUG Console.WriteLine("null process handle"); - if (string.Compare(fileName,this.ExeFileName,true)==0) +#endif + if (string.Compare(fileName,this.ExeFileName,true)==0) { FileName = null; handle = 0;