# HG changeset patch
# User cin
# Date 2016-10-25 14:40:45
# Node ID 86b61d53b7db5c45fb6a519476de7e73f51481a9
# Parent  8200ab154c8a8ecec0a9c6279d61e47b9252ab01
# Parent  cbb0bd8fc0d1b2e31948788198811cdf517b2fbb

Слияние

diff --git a/Implab.Diagnostics.Interactive/InteractiveListener.cs b/Implab.Diagnostics.Interactive/InteractiveListener.cs
--- a/Implab.Diagnostics.Interactive/InteractiveListener.cs
+++ b/Implab.Diagnostics.Interactive/InteractiveListener.cs
@@ -112,7 +112,7 @@ namespace Implab.Diagnostics.Interactive
                 Indent = args.Operation.Level,
                 Message = entry.ToString(),
                 Thread = args.ThreadId,
-                Channel = args.ChannelName,
+                Channel = args.Channel.ToString(),
                 Timestamp = Environment.TickCount
             };
 
diff --git a/Implab.Diagnostics.Interactive/TraceForm.cs b/Implab.Diagnostics.Interactive/TraceForm.cs
--- a/Implab.Diagnostics.Interactive/TraceForm.cs
+++ b/Implab.Diagnostics.Interactive/TraceForm.cs
@@ -31,7 +31,8 @@ namespace Implab.Diagnostics.Interactive
 
         public void AddTraceEvent(TraceViewItem item) {
             traceViewItemBindingSource.Add(item);
-            eventsDataGrid.FirstDisplayedScrollingRowIndex = eventsDataGrid.RowCount - 1;
+            if(eventsDataGrid.RowCount > 0)
+                eventsDataGrid.FirstDisplayedScrollingRowIndex = eventsDataGrid.RowCount - 1;
         }
 
         Color GetThreadColor(int thread) {