diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index 7dc3d7d69..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 = "3347"; + 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 8325c8026..304c7569b 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ %MINOR%=9 -%REVISION%=3347 +%REVISION%=3349 %COREVERSION%=0 %MAJOR%=3 diff --git a/Release/pabcversion.txt b/Release/pabcversion.txt index d2bb020ef..52e2f648a 100644 --- a/Release/pabcversion.txt +++ b/Release/pabcversion.txt @@ -1 +1 @@ -3.9.0.3347 +3.9.0.3349 diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index d1fbd53a1..64c2198b1 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.9.0.3347' +!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; diff --git a/VisualPlugins/TraningControlPlugin/TeacherControlPlugin.cs b/VisualPlugins/TraningControlPlugin/TeacherControlPlugin.cs index c44ee6213..cdee9b199 100644 --- a/VisualPlugins/TraningControlPlugin/TeacherControlPlugin.cs +++ b/VisualPlugins/TraningControlPlugin/TeacherControlPlugin.cs @@ -46,6 +46,8 @@ public VisualPascalABCPlugin_TeacherControlPlugin(IWorkbench Workbench) this.Workbench = Workbench; VisualEnvironmentCompiler = Workbench.VisualEnvironmentCompiler; + User = new SiteAccessProvider(); + if (IsLightPTInWorkingDirectory()) { IsMechmath = System.Environment.MachineName.ToLower().StartsWith("mil8a-"); @@ -54,8 +56,6 @@ public VisualPascalABCPlugin_TeacherControlPlugin(IWorkbench Workbench) } // RegisterForm.VisualEnvironmentCompiler = VisualEnvironmentCompiler; // Пока форма регистрации никак не связана с компилятором - User = new SiteAccessProvider(); - // Регистрация обработчика this.Workbench.ServiceContainer.RunService.Starting += RunStartingHandler; this.Workbench.ServiceContainer.RunService.ChangeArgsBeforeRun += ChangeArgsBeforeRunHandler;