From 1942ffca6dffb0d70264a33182a94afff845800d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D0=BE=D0=BD=D0=B4=D0=B0=D1=80=D0=B5=D0=B2=20=D0=98?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD?= Date: Sun, 11 Oct 2020 12:18:25 +0200 Subject: [PATCH] fix pascalabcnet/pascalabcnetide#187 --- VisualPascalABCNET/DockContent/ErrorsListWindowForm.cs | 4 +++- VisualPlugins/PT4Provider/PT4Provider.csproj | 4 ++++ VisualPlugins/PT4Provider/PT4ProviderPlugin.cs | 10 +++++++++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/VisualPascalABCNET/DockContent/ErrorsListWindowForm.cs b/VisualPascalABCNET/DockContent/ErrorsListWindowForm.cs index 0430b61c8..45eb9f14e 100644 --- a/VisualPascalABCNET/DockContent/ErrorsListWindowForm.cs +++ b/VisualPascalABCNET/DockContent/ErrorsListWindowForm.cs @@ -115,10 +115,12 @@ namespace VisualPascalABC lvErrorsList.Items[i].SubItems[ErrorListLineCol].Text = er.SourceLocation.BeginPosition.Line.ToString(); } } - if (Err is PascalABCCompiler.Errors.CompilerInternalError) + else if (Err is PascalABCCompiler.Errors.CompilerInternalError) { lvErrorsList.Items[i].SubItems[ErrorListDescrCol].Text = (Err as PascalABCCompiler.Errors.CompilerInternalError).ToString(); } + else + lvErrorsList.Items[i].SubItems[ErrorListDescrCol].Text = Err.Message; i++; } if (ErrorsList.Count > 0 && !(ErrorsList[0] is PascalABCCompiler.Errors.CompilerWarning)) diff --git a/VisualPlugins/PT4Provider/PT4Provider.csproj b/VisualPlugins/PT4Provider/PT4Provider.csproj index e608b0019..83462c494 100644 --- a/VisualPlugins/PT4Provider/PT4Provider.csproj +++ b/VisualPlugins/PT4Provider/PT4Provider.csproj @@ -106,6 +106,10 @@ {1E42361A-EDA3-4872-88AF-A3AAF600D36D} Compiler + + {44a01f9e-dce7-470c-aae5-c3de0ccbee3b} + Errors + {2DE2842F-0912-4251-BC0F-480854C44A13} Localization diff --git a/VisualPlugins/PT4Provider/PT4ProviderPlugin.cs b/VisualPlugins/PT4Provider/PT4ProviderPlugin.cs index bfde34adc..e21247204 100644 --- a/VisualPlugins/PT4Provider/PT4ProviderPlugin.cs +++ b/VisualPlugins/PT4Provider/PT4ProviderPlugin.cs @@ -142,7 +142,15 @@ namespace VisualPascalABCPlugins pt4setup.StartInfo.FileName = PT4Dir + "\\PT4Setup.exe"; if (System.IO.File.Exists(pt4setup.StartInfo.FileName)) - pt4setup.Start(); + try + { + pt4setup.Start(); + } + catch(Exception ex) + { + VisualEnvironmentCompiler.ExecuteAction(VisualEnvironmentCompilerAction.AddMessageToErrorListWindow, + new List(new PascalABCCompiler.Errors.Error[] { new PascalABCCompiler.Errors.Error(ex.Message) })); + } } public void GetGUI(List MenuItems, List ToolBarItems) {