diff options
| author | Mataes <mataes2007@gmail.com> | 2020-04-24 13:16:07 +0300 |
|---|---|---|
| committer | Mataes <mataes2007@gmail.com> | 2020-04-24 13:16:07 +0300 |
| commit | 8f1339b651bab945473b77d490c746cd2b63f2db (patch) | |
| tree | aa0e9ea53546a711b478a3ff12f576022cd24c24 /protocols/ICQ-WIM/src/server.cpp | |
| parent | 7c0f7e47299744f043ffb02ea22b538bc18af275 (diff) | |
| parent | 9a6edd6536e64f526d769f8ccc18608c32afc20d (diff) | |
Merge branch 'master' of https://github.com/miranda-ng/miranda-ng
Diffstat (limited to 'protocols/ICQ-WIM/src/server.cpp')
| -rw-r--r-- | protocols/ICQ-WIM/src/server.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/protocols/ICQ-WIM/src/server.cpp b/protocols/ICQ-WIM/src/server.cpp index cee7078357..6f37950339 100644 --- a/protocols/ICQ-WIM/src/server.cpp +++ b/protocols/ICQ-WIM/src/server.cpp @@ -521,7 +521,7 @@ AsyncHttpRequest* CIcqProto::UserInfoRequest(MCONTACT hContact) return pReq; } -void CIcqProto::RetrieveUserHistory(MCONTACT hContact, __int64 startMsgId, bool bFromHistory) +void CIcqProto::RetrieveUserHistory(MCONTACT hContact, __int64 startMsgId) { if (startMsgId == 0) startMsgId = -1; @@ -531,7 +531,6 @@ void CIcqProto::RetrieveUserHistory(MCONTACT hContact, __int64 startMsgId, bool pReq->flags |= NLHRF_NODUMPSEND; #endif pReq->hContact = hContact; - pReq->pUserInfo = (bFromHistory) ? pReq : nullptr; __int64 patchVer = getId(hContact, DB_KEY_PATCHVER); if (patchVer == 0) @@ -910,7 +909,7 @@ void CIcqProto::OnGetUserHistory(NETLIBHTTPREQUEST *pReply, AsyncHttpRequest *pR auto &results = root.results(); for (auto &it : results["messages"]) - ParseMessage(pReq->hContact, lastMsgId, it, pReq->pUserInfo != nullptr); + ParseMessage(pReq->hContact, lastMsgId, it, true); setId(pReq->hContact, DB_KEY_LASTMSGID, lastMsgId); } |