From 792e013eaf4a572364457b96f6f9c07dafe6fe9a Mon Sep 17 00:00:00 2001 From: "Esteban I. RM" Date: Sun, 15 Oct 2017 21:22:22 -0300 Subject: don't pass g_settings around, and use it directly --- src/chat.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/chat.cpp') diff --git a/src/chat.cpp b/src/chat.cpp index 967e159f8..a5d82a649 100644 --- a/src/chat.cpp +++ b/src/chat.cpp @@ -369,12 +369,11 @@ s32 ChatBuffer::getBottomScrollPos() const return formatted_count - rows; } -void ChatBuffer::resize(u32 scrollback) { +void ChatBuffer::resize(u32 scrollback) +{ m_scrollback = scrollback; if (m_unformatted.size() > m_scrollback) - { deleteOldest(m_unformatted.size() - m_scrollback); - } } @@ -739,8 +738,11 @@ void ChatBackend::clearRecentChat() } -void ChatBackend::applySettings(Settings* settings) { - m_recent_buffer.resize(settings->getU32("recent_chat_size")); +void ChatBackend::applySettings() +{ + u32 recent_lines = g_settings->getU32("recent_chat_messages"); + recent_lines = rangelim(recent_lines, 2, 20); + m_recent_buffer.resize(recent_lines); } void ChatBackend::step(float dtime) -- cgit v1.2.3