# HG changeset patch
# User cin
# Date 1477406445 -10800
# Node ID 86b61d53b7db5c45fb6a519476de7e73f51481a9
# Parent  8200ab154c8a8ecec0a9c6279d61e47b9252ab01# Parent  cbb0bd8fc0d1b2e31948788198811cdf517b2fbb
Слияние

diff -r 8200ab154c8a -r 86b61d53b7db Implab.Diagnostics.Interactive/InteractiveListener.cs
--- a/Implab.Diagnostics.Interactive/InteractiveListener.cs	Tue Oct 25 17:40:33 2016 +0300
+++ b/Implab.Diagnostics.Interactive/InteractiveListener.cs	Tue Oct 25 17:40:45 2016 +0300
@@ -112,7 +112,7 @@
                 Indent = args.Operation.Level,
                 Message = entry.ToString(),
                 Thread = args.ThreadId,
-                Channel = args.ChannelName,
+                Channel = args.Channel.ToString(),
                 Timestamp = Environment.TickCount
             };
 
diff -r 8200ab154c8a -r 86b61d53b7db Implab.Diagnostics.Interactive/TraceForm.cs
--- a/Implab.Diagnostics.Interactive/TraceForm.cs	Tue Oct 25 17:40:33 2016 +0300
+++ b/Implab.Diagnostics.Interactive/TraceForm.cs	Tue Oct 25 17:40:45 2016 +0300
@@ -31,7 +31,8 @@
 
         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) {