[Libreoffice-commits] online.git: Branch 'private/hcvcastro/forking' - loolwsd/LOOLKit.cpp

Henry Castro hcastro at collabora.com
Sun Sep 27 15:57:41 PDT 2015


 loolwsd/LOOLKit.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7a12c411b841b4ace184f095489be704609cf221
Author: Henry Castro <hcastro at collabora.com>
Date:   Sun Sep 27 18:57:05 2015 -0400

    loolwsd: forgot uncomment loKit

diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index 9d0376b..5e46c58 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -313,7 +313,7 @@ void run_lok_main(const std::string &loSubPath, Poco::UInt64 _childId, const std
                         else
                         { // new thread id
                             //std::cout << Util::logPrefix() << "new thread starting!" << std::endl;
-                            auto thread = std::shared_ptr<Connection>(new Connection(NULL/*loKit*/, _childId, tokens[1]));
+                            auto thread = std::shared_ptr<Connection>(new Connection(loKit, _childId, tokens[1]));
                             auto aInserted = _connections.insert(
                                 std::pair<std::string, std::shared_ptr<Connection>>
                                 (


More information about the Libreoffice-commits mailing list