[Libreoffice-commits] online.git: loolwsd/LOOLBroker.cpp

Henry Castro hcastro at collabora.com
Wed Feb 3 21:15:14 UTC 2016


 loolwsd/LOOLBroker.cpp |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 1fc3d06e378bc97edb15673ffbcb11124b2f28de
Author: Henry Castro <hcastro at collabora.com>
Date:   Wed Feb 3 17:15:20 2016 -0400

    loolwsd: fix iterator erase

diff --git a/loolwsd/LOOLBroker.cpp b/loolwsd/LOOLBroker.cpp
index 181c52c..df278a5 100644
--- a/loolwsd/LOOLBroker.cpp
+++ b/loolwsd/LOOLBroker.cpp
@@ -374,12 +374,13 @@ public:
                 log << "Error querying child [" << std::to_string(it->second->getPid()) << "].";
                 if (it->second->getUrl().empty())
                 {
-                    log << " Removing empty child.";
+                    log << " Removing empty child." << Log::end;
                     it = _childProcesses.erase(it);
                 }
-
-                log << Log::end;
-                ++it;
+                else
+                {
+                    ++it;
+                }
                 continue;
             }
 


More information about the Libreoffice-commits mailing list