[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd' - wsd/Admin.cpp

[Pranav Kant]

 wsd/Admin.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9d29240d467923aa5d332f37c799410eeffb777d
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Sat Jul 8 01:52:46 2017 +0530

    Update the iterator too
    
    Change-Id: Ia715fa11eb21a25935a2075d09c674bd45472e96
    (cherry picked from commit 5ef7606316c44e5a180ff43cf9f779cf2d24399b)
    Reviewed-on: https://gerrit.libreoffice.org/39711
    Reviewed-by: pranavk <pranavk at collabora.co.uk>
    Tested-by: pranavk <pranavk at collabora.co.uk>

diff --git a/wsd/Admin.cpp b/wsd/Admin.cpp
index 3cffc82b..39c8618d 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;