From c8e14baa975d929941fe3d7dabd77667505c3f2b Mon Sep 17 00:00:00 2001 From: Peter Burgess Date: Tue, 13 Mar 2018 16:13:23 +0000 Subject: Tiny fix adding #ifdef to call to logMessage() In ChatControllerBase::handleIncomingMessage(), there is a call to logMessage() that should have been wrapped in "#ifdef SWIFT_EXPERIMENTAL_HISTORY", and now it is. Test-information Unit tests still pass, swift still runs as expected. Change-Id: Ia985565d496d73a5c6fed5ce79390b7b0a4b0551 diff --git a/Swift/Controllers/Chat/ChatControllerBase.cpp b/Swift/Controllers/Chat/ChatControllerBase.cpp index 2ef91fa..f514346 100644 --- a/Swift/Controllers/Chat/ChatControllerBase.cpp +++ b/Swift/Controllers/Chat/ChatControllerBase.cpp @@ -306,7 +306,9 @@ void ChatControllerBase::handleIncomingMessage(std::shared_ptr mes addMessageHandleIncomingMessage(from, chatMessage, message->getID(), senderIsSelf, label, timeStamp); } +#ifdef SWIFT_EXPERIMENTAL_HISTORY logMessage(body, from, selfJID_, timeStamp, true); +#endif } chatWindow_->show(); updateMessageCount(); -- cgit v0.10.2-6-g49f6