fix message limiter

Luch00 · Sep 24, 2018 · a7083d9 · a7083d9
1 parent 18a0798
commit a7083d9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/LxBTSC/template/js/messages.js b/LxBTSC/template/js/messages.js
@@ -98,8 +98,9 @@ function ThumbnailAvatar(img) {
 }
 
 function CheckMessageLimit(tab) {
-    if (tab.childElementCount > Config.MAX_LINES) {
-        tab.firstElementChild.remove();
+    let over = tab.children().length - Config.MAX_LINES;
+    if(over > 0) {
+        tab.children().slice(0, over).remove();
     }
 }
 

diff --git a/QtLxBTSC/ChatWidget.cpp b/QtLxBTSC/ChatWidget.cpp
@@ -42,8 +42,11 @@ ChatWidget::ChatWidget(QString path, TsWebObject* webObject, QWidget *parent)
 	connect(view, &QWebEngineView::customContextMenuRequested, this, &ChatWidget::onShowContextMenu);
 	connect(view, &QWebEngineView::loadFinished, this, [=]()
 	{
-		loadComplete = true;
-		ts3Functions.logMessage("Page load finished", LogLevel_INFO, "BetterChat", 0);
+		if (!loadComplete)
+		{
+			loadComplete = true;
+			ts3Functions.logMessage("Page load finished", LogLevel_INFO, "BetterChat", 0);
+		}
 	});
 
 	setupPage();