Merge branch 'development' of https://github.com/fdorg/flashdevelop into development

Meychi · Meychi · commit c80cde277fd5 · 2016-03-22T00:10:53.000+02:00
diff --git a/External/Plugins/ResultsPanel/PluginUI.cs b/External/Plugins/ResultsPanel/PluginUI.cs
@@ -647,7 +647,7 @@ public void AddLogEntries()
             String projectDir = project != null ? Path.GetDirectoryName(project.ProjectPath) : "";
             Boolean limitMode = (count - this.logCount) > 1000;
             this.entriesView.BeginUpdate();
-            for (Int32 i = this.logCount; i < (limitMode ? 1000 : count); i++)
+            for (Int32 i = this.logCount; i < (limitMode ? this.logCount + 1000 : count); i++)
             {
                 entry = TraceManager.TraceLog[i];
                 if (entry.Message != null && entry.Message.Length > 7 && entry.Message.IndexOf(':') > 0)

Original file line number	Diff line number	Diff line change
`@@ -647,7 +647,7 @@ public void AddLogEntries()`
`647`	`647`	`String projectDir = project != null ? Path.GetDirectoryName(project.ProjectPath) : "";`
`648`	`648`	`Boolean limitMode = (count - this.logCount) > 1000;`
`649`	`649`	`this.entriesView.BeginUpdate();`
`650`		`- for (Int32 i = this.logCount; i < (limitMode ? 1000 : count); i++)`
	`650`	`+ for (Int32 i = this.logCount; i < (limitMode ? this.logCount + 1000 : count); i++)`
`651`	`651`	`{`
`652`	`652`	`entry = TraceManager.TraceLog[i];`
`653`	`653`	`if (entry.Message != null && entry.Message.Length > 7 && entry.Message.IndexOf(':') > 0)`