fix(history): don't save own messages when history is disabled

Fix #5036
qTox · Mar 30, 2018 · b852809 · b852809
1 parent 7627d60
commit b852809
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/persistence/history.cpp b/src/persistence/history.cpp
@@ -230,6 +230,10 @@ void History::addNewMessage(const QString& friendPk, const QString& message, con
                             const QDateTime& time, bool isSent, QString dispName,
                             const std::function<void(int64_t)>& insertIdCallback)
 {
+    if (!Settings::getInstance().getEnableLogging()) {
+        qWarning() << "Blocked a message from being added to database while history is disabled";
+        return;
+    }
     if (!isValid()) {
         return;
     }

diff --git a/src/widget/form/chatform.cpp b/src/widget/form/chatform.cpp
@@ -984,7 +984,7 @@ void ChatForm::SendMessageStr(QString msg)
         uint32_t friendId = f->getId();
         int rec = isAction ? core->sendAction(friendId, part) : core->sendMessage(friendId, part);
 
-        if (history) {
+        if (history && Settings::getInstance().getEnableLogging()) {
             auto* offMsgEngine = getOfflineMsgEngine();
             QString selfPk = Core::getInstance()->getSelfId().toString();
             QString pk = f->getPublicKey().toString();