diff --git a/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/Entry/ConnectorRhinoCommand.cs b/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/Entry/ConnectorRhinoCommand.cs index 813938a4fc..0f218aae57 100644 --- a/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/Entry/ConnectorRhinoCommand.cs +++ b/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/Entry/ConnectorRhinoCommand.cs @@ -28,7 +28,6 @@ public class SpeckleCommand : Command public static Window MainWindow { get; private set; } - private static CancellationTokenSource Lifetime = null; public static Avalonia.Application AvaloniaApp { get; set; } @@ -59,7 +58,6 @@ public static AppBuilder BuildAvaloniaApp() protected override Result RunCommand(RhinoDoc doc, RunMode mode) { - #if DEBUG SpeckleRhinoConnectorPlugin.Instance.Init(); #endif @@ -73,7 +71,6 @@ protected override Result RunCommand(RhinoDoc doc, RunMode mode) #endif Rhino.UI.Panels.OpenPanel(typeof(Panel).GUID); - return Result.Success; } diff --git a/DesktopUI2/DesktopUI2/ViewModels/StreamViewModel.cs b/DesktopUI2/DesktopUI2/ViewModels/StreamViewModel.cs index 8d2ccfd558..61f84aad0f 100644 --- a/DesktopUI2/DesktopUI2/ViewModels/StreamViewModel.cs +++ b/DesktopUI2/DesktopUI2/ViewModels/StreamViewModel.cs @@ -320,7 +320,9 @@ public string Log { get { - string defaultMessage = "\nWelcome to the report! \n\nObjects you send or receive will appear here to help you understand how your document has changed."; + string defaultMessage = string.IsNullOrEmpty(Progress.Report.ConversionLogString) ? + "\nWelcome to the report! \n\nObjects you send or receive will appear here to help you understand how your document has changed." : + Progress.Report.ConversionLogString; string reportInfo = $"\nOperation: {(PreviewOn ? "Preview " : "")}{(IsReceiver ? "Received at " : "Sent at ")}{DateTime.Now.ToLocalTime().ToString("dd/MM/yy HH:mm:ss")}"; reportInfo += $"\nTotal: {Report.Count} objects"; diff --git a/DesktopUI2/DesktopUI2/Views/Pages/StreamEditView.xaml b/DesktopUI2/DesktopUI2/Views/Pages/StreamEditView.xaml index 19f6cf12b0..fec2ef2348 100644 --- a/DesktopUI2/DesktopUI2/Views/Pages/StreamEditView.xaml +++ b/DesktopUI2/DesktopUI2/Views/Pages/StreamEditView.xaml @@ -169,11 +169,6 @@ - - - - -