diff --git a/src/base/logger.cpp b/src/base/logger.cpp index c27ef1784..ff6216a14 100644 --- a/src/base/logger.cpp +++ b/src/base/logger.cpp @@ -49,7 +49,6 @@ Logger *Logger::m_instance = nullptr; Logger::Logger() : m_messages(MAX_LOG_MESSAGES) , m_peers(MAX_LOG_MESSAGES) - , m_lock(QReadWriteLock::Recursive) { } @@ -75,9 +74,9 @@ void Logger::freeInstance() void Logger::addMessage(const QString &message, const Log::MsgType &type) { QWriteLocker locker(&m_lock); - const Log::Msg temp = {m_msgCounter++, QDateTime::currentMSecsSinceEpoch(), type, message.toHtmlEscaped()}; m_messages.push_back(temp); + locker.unlock(); emit newLogMessage(temp); } @@ -85,9 +84,9 @@ void Logger::addMessage(const QString &message, const Log::MsgType &type) void Logger::addPeer(const QString &ip, const bool blocked, const QString &reason) { QWriteLocker locker(&m_lock); - const Log::Peer temp = {m_peerCounter++, QDateTime::currentMSecsSinceEpoch(), ip.toHtmlEscaped(), blocked, reason.toHtmlEscaped()}; m_peers.push_back(temp); + locker.unlock(); emit newLogPeer(temp); } diff --git a/src/base/settingsstorage.cpp b/src/base/settingsstorage.cpp index 85fdaad4f..0f57ccb45 100644 --- a/src/base/settingsstorage.cpp +++ b/src/base/settingsstorage.cpp @@ -155,7 +155,6 @@ SettingsStorage *SettingsStorage::m_instance = nullptr; SettingsStorage::SettingsStorage() : m_data{TransactionalSettings(QLatin1String("qBittorrent")).read()} , m_dirty(false) - , m_lock(QReadWriteLock::Recursive) { m_timer.setSingleShot(true); m_timer.setInterval(5 * 1000);