Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed a bug regarding the log limit being zero.

Browse Source 
- This also returned the previous behaviour when the log limit is zero,
that is, no log limit is applied then.
This commit is contained in:
Cerapter 2018-08-16 18:48:11 +02:00
parent d6b6a03802
commit 331bca5f73
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
courtroom.cpp
View File

@ -1422,7 +1422,7 @@ void Courtroom::append_ic_text(QString p_text, QString p_name)
ui_ic_chatlog->textCursor().insertText(p_text, normal); ui_ic_chatlog->textCursor().insertText(p_text, normal);
// If we got too many blocks in the current log, delete some from the top. // If we got too many blocks in the current log, delete some from the top.
while (ui_ic_chatlog->document()->blockCount() > log_maximum_blocks) while (ui_ic_chatlog->document()->blockCount() > log_maximum_blocks && log_maximum_blocks > 0)
{ {
ui_ic_chatlog->moveCursor(QTextCursor::Start); ui_ic_chatlog->moveCursor(QTextCursor::Start);
ui_ic_chatlog->textCursor().select(QTextCursor::BlockUnderCursor); ui_ic_chatlog->textCursor().select(QTextCursor::BlockUnderCursor);
@ -1454,7 +1454,7 @@ void Courtroom::append_ic_text(QString p_text, QString p_name)
ui_ic_chatlog->textCursor().insertText(p_text + '\n', normal); ui_ic_chatlog->textCursor().insertText(p_text + '\n', normal);
// If we got too many blocks in the current log, delete some from the bottom. // If we got too many blocks in the current log, delete some from the bottom.
while (ui_ic_chatlog->document()->blockCount() > log_maximum_blocks) while (ui_ic_chatlog->document()->blockCount() > log_maximum_blocks && log_maximum_blocks > 0)
{ {
ui_ic_chatlog->moveCursor(QTextCursor::End); ui_ic_chatlog->moveCursor(QTextCursor::End);
ui_ic_chatlog->textCursor().select(QTextCursor::BlockUnderCursor); ui_ic_chatlog->textCursor().select(QTextCursor::BlockUnderCursor);
@ -1510,7 +1510,7 @@ void Courtroom::append_ic_songchange(QString p_songname, QString p_name)
ui_ic_chatlog->textCursor().insertText(p_songname + ".", italics); ui_ic_chatlog->textCursor().insertText(p_songname + ".", italics);
// If we got too many blocks in the current log, delete some from the top. // If we got too many blocks in the current log, delete some from the top.
while (ui_ic_chatlog->document()->blockCount() > log_maximum_blocks) while (ui_ic_chatlog->document()->blockCount() > log_maximum_blocks && log_maximum_blocks > 0)
{ {
ui_ic_chatlog->moveCursor(QTextCursor::Start); ui_ic_chatlog->moveCursor(QTextCursor::Start);
ui_ic_chatlog->textCursor().select(QTextCursor::BlockUnderCursor); ui_ic_chatlog->textCursor().select(QTextCursor::BlockUnderCursor);
@ -1538,13 +1538,13 @@ void Courtroom::append_ic_songchange(QString p_songname, QString p_name)
ui_ic_chatlog->moveCursor(QTextCursor::Start); ui_ic_chatlog->moveCursor(QTextCursor::Start);
ui_ic_chatlog->textCursor().insertText('\n' + p_name, bold); ui_ic_chatlog->textCursor().insertText(p_name, bold);
ui_ic_chatlog->textCursor().insertText(" has played a song: ", normal); ui_ic_chatlog->textCursor().insertText(" has played a song: ", normal);
ui_ic_chatlog->textCursor().insertText(p_songname + ".", italics); ui_ic_chatlog->textCursor().insertText(p_songname + "." + '\n', italics);
// If we got too many blocks in the current log, delete some from the bottom. // If we got too many blocks in the current log, delete some from the bottom.
while (ui_ic_chatlog->document()->blockCount() > log_maximum_blocks) while (ui_ic_chatlog->document()->blockCount() > log_maximum_blocks && log_maximum_blocks > 0)
{ {
ui_ic_chatlog->moveCursor(QTextCursor::End); ui_ic_chatlog->moveCursor(QTextCursor::End);
ui_ic_chatlog->textCursor().select(QTextCursor::BlockUnderCursor); ui_ic_chatlog->textCursor().select(QTextCursor::BlockUnderCursor);