changeset 206:86b61d53b7db v2

Слияние
author cin
date Tue, 25 Oct 2016 17:40:45 +0300
parents 8200ab154c8a (current diff) cbb0bd8fc0d1 (diff)
children 558f34b2fb50
files
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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
             };
 
--- 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) {