Merge pull request #1488 from brine/master2

kellyelton · kellyelton · commit f4c0ec35afe1 · 2015-07-07T18:36:39.000-05:00
hide error/debug checkboxes will now hide/show the entire chat log
diff --git a/octgnFX/Octgn/Play/Gui/ChatControl.xaml.cs b/octgnFX/Octgn/Play/Gui/ChatControl.xaml.cs
@@ -88,6 +88,8 @@ public bool HideErrors
                 {
                     return;
                 }
+                this.output.Document.Blocks.Clear();
+                lastId = -1;
                 this.hideErrors = value;
                 this.OnPropertyChanged("HideErrors");
             }
@@ -116,7 +118,12 @@ public bool HideDebug
             }
             set
             {
-                if (value == this.hideDebug) return;
+                if (value.Equals(this.hideDebug))
+                {
+                    return;
+                }
+                this.output.Document.Blocks.Clear();
+                lastId = -1;
                 this.hideDebug = value;
                 OnPropertyChanged("HideDebug");
             }
diff --git a/recentchanges.txt b/recentchanges.txt
@@ -1 +1 @@
-
+Hide Debug and Hide Error checkboxes will affect all previous chat log as well

Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,8 @@ public bool HideErrors`
`88`	`88`	`{`
`89`	`89`	`return;`
`90`	`90`	`}`
	`91`	`+ this.output.Document.Blocks.Clear();`
	`92`	`+ lastId = -1;`
`91`	`93`	`this.hideErrors = value;`
`92`	`94`	`this.OnPropertyChanged("HideErrors");`
`93`	`95`	`}`
`@@ -116,7 +118,12 @@ public bool HideDebug`
`116`	`118`	`}`
`117`	`119`	`set`
`118`	`120`	`{`
`119`		`- if (value == this.hideDebug) return;`
	`121`	`+ if (value.Equals(this.hideDebug))`
	`122`	`+ {`
	`123`	`+ return;`
	`124`	`+ }`
	`125`	`+ this.output.Document.Blocks.Clear();`
	`126`	`+ lastId = -1;`
`120`	`127`	`this.hideDebug = value;`
`121`	`128`	`OnPropertyChanged("HideDebug");`
`122`	`129`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-`
	`1`	`+Hide Debug and Hide Error checkboxes will affect all previous chat log as well`