Issue 1242.

Don't try to load more lines than the frameBuffer allows.
This reduces the time the client hangs, but the underlying problem (adding lotsa lines takes lotsa time) is still there


git-svn-id: http://svn.dmdirc.com/trunk@4061 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/addons/logging/HistoryWindow.java

@@ -67,9 +67,11 @@ public class HistoryWindow extends FrameContainer {
         window.setTitle(title);
         window.setVisible(true);
         
-        final Stack<String> lines = reader.getLines(
-                IdentityManager.getGlobalConfig().getOptionInt("plugin-Logging",
-                "history.lines", 50000));
+        final int historyLineCount = IdentityManager.getGlobalConfig().getOptionInt(
+                "plugin-Logging", "history.lines", 50000);
+        final int frameBufferSize = IdentityManager.getGlobalConfig().getOptionInt(
+                "ui", "frameBufferSize", 10000);
+        final Stack<String> lines = reader.getLines(Math.min(frameBufferSize, historyLineCount));
         while (lines.size() > 0) {
             window.addLine(lines.pop(), false);
         }