diff options
author | Pranav Kant <pranavk@collabora.co.uk> | 2017-07-08 01:52:46 +0530 |
---|---|---|
committer | pranavk <pranavk@collabora.co.uk> | 2017-07-07 22:35:25 +0200 |
commit | 9d29240d467923aa5d332f37c799410eeffb777d (patch) | |
tree | d1a0f38591a2be926f76d65b3a2773bd9aa53a4f | |
parent | cc8fc1a28bd2d19e72754720327ffa443e2daa40 (diff) |
Update the iterator too2.1.2-7
Change-Id: Ia715fa11eb21a25935a2075d09c674bd45472e96
(cherry picked from commit 5ef7606316c44e5a180ff43cf9f779cf2d24399b)
Reviewed-on: https://gerrit.libreoffice.org/39711
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
-rw-r--r-- | wsd/Admin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wsd/Admin.cpp b/wsd/Admin.cpp index 3cffc82ba..39c8618da 100644 --- a/wsd/Admin.cpp +++ b/wsd/Admin.cpp @@ -456,7 +456,7 @@ void Admin::triggerMemoryCleanup(size_t totalMem) LOG_DBG("OOM: Killing saved document with DocKey " << docIt->_docKey); LOOLWSD::closeDocument(docIt->_docKey, "oom"); memToFree -= docIt->_mem; - docList.erase(docIt); + docIt = docList.erase(docIt); } else ++docIt; |