Zzz – Diff between revs 2 and 4

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 4
Line 9... Line 9...
9 public partial class LogViewForm : Form 9 public partial class LogViewForm : Form
10 { 10 {
11 private readonly MainForm _mainForm; 11 private readonly MainForm _mainForm;
Line 12... Line 12...
12   12  
-   13 private readonly LogMemorySink _memorySink;
Line 13... Line 14...
13 private readonly LogMemorySink _memorySink; 14 private readonly object _memorySinkLock;
14   15  
15 public LogViewForm() 16 public LogViewForm()
16 { 17 {
Line 21... Line 22...
21 { 22 {
22 _mainForm = mainForm; 23 _mainForm = mainForm;
23 _mainForm.MemorySinkEnabled = true; 24 _mainForm.MemorySinkEnabled = true;
24 } 25 }
Line 25... Line 26...
25   26  
26 public LogViewForm(MainForm mainForm, LogMemorySink memorySink) : 27 public LogViewForm(MainForm mainForm, LogMemorySink memorySink, object memorySinkLock) :
27 this(mainForm) 28 this(mainForm)
28 { 29 {
-   30 _memorySink = memorySink;
29 _memorySink = memorySink; 31 _memorySinkLock = memorySinkLock;
30 _memorySink.Events.CollectionChanged += Events_CollectionChanged; 32 _memorySink.Events.CollectionChanged += Events_CollectionChanged;
Line 31... Line 33...
31 } 33 }
32   34  
Line 39... Line 41...
39 if (disposing && components != null) 41 if (disposing && components != null)
40 { 42 {
41 components.Dispose(); 43 components.Dispose();
42 } 44 }
Line 43... Line -...
43   -  
44 _memorySink.Events.CollectionChanged -= Events_CollectionChanged; -  
45   45  
-   46 _mainForm.MemorySinkEnabled = false;
-   47  
-   48 lock (_memorySinkLock)
-   49 {
46 _mainForm.MemorySinkEnabled = false; 50 _memorySink.Events.CollectionChanged -= Events_CollectionChanged;
-   51 _memorySink.Clear();
Line 47... Line 52...
47 _memorySink.Clear(); 52 }
48   53  
Line 49... Line 54...
49 base.Dispose(disposing); 54 base.Dispose(disposing);