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

[Pranav Kant]

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

New commits:
commit 072c934620be7abc63c91ec97c5143f4fafcee7d
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)
    (cherry picked from commit d5df2762ff06ff8e9ede4a06a78cddd177e7dfc0)

diff --git a/wsd/Admin.cpp b/wsd/Admin.cpp
index cb85edbc..0e78f9e9 100644
--- a/wsd/Admin.cpp
+++ b/wsd/Admin.cpp
@@ -457,7 +457,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;